diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-01-19 22:34:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 22:34:47 +0100 |
| commit | b76f5147a898570ff5944b29b18d9bc18a831bd4 (patch) | |
| tree | de7b1fca6d77abecd59fa6133dda7a4940ba103f | |
| parent | 66523fc6cf67017b5144990cb07fcee0bad3eb10 (diff) | |
| parent | 7686e58bf2d0dce742f6d78a83e1882934e52c4a (diff) | |
Merge pull request #20877 from vespa-engine/hmusum/handle-config-server-error-code-CONFIG_NOT_CONVERGED
Handle error code CONFIG_NOT_CONVERGED when deploying
2 files changed, 3 insertions, 2 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java index 9d51c5ca9d1..f0b681fd9c9 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServerException.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.api.integration.configserver; import com.yahoo.slime.Inspector; import com.yahoo.slime.SlimeUtils; -import org.apache.hc.core5.http.ClassicHttpRequest; import java.util.stream.Stream; @@ -41,7 +40,8 @@ public class ConfigServerException extends RuntimeException { PARENT_HOST_NOT_READY, CERTIFICATE_NOT_READY, LOAD_BALANCER_NOT_READY, - INCOMPLETE_RESPONSE + INCOMPLETE_RESPONSE, + CONFIG_NOT_CONVERGED } public static ConfigServerException readException(byte[] body, String context) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 225634634b2..28f48bd1cab 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -253,6 +253,7 @@ public class InternalStepRunner implements StepRunner { return result; case ACTIVATION_CONFLICT: case APPLICATION_LOCK_FAILURE: + case CONFIG_NOT_CONVERGED: logger.log("Deployment failed with possibly transient error " + e.code() + ", will retry: " + e.getMessage()); return result; |