diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-01-30 11:37:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 11:37:28 +0100 |
| commit | 18c60a40dedd0eb314db9295d6a46ee29f809ff7 (patch) | |
| tree | a4ca5867192b082e29418ad3b7332b4cee9ed213 /controller-server | |
| parent | c06a7d78d68c22b66e0cdf8b6f4aa838259a85af (diff) | |
| parent | 41517d52cf381ab35e8593782821125542786da7 (diff) | |
Merge pull request #8262 from vespa-engine/freva/refuse-to-activate-nodes-on-non-ready-hosts
Refuse to activate nodes on not ready hosts
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 61226d51166..51d4033044f 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 @@ -64,6 +64,7 @@ import static com.yahoo.vespa.hosted.controller.api.integration.configserver.Con import static com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException.ErrorCode.BAD_REQUEST; import static com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException.ErrorCode.INVALID_APPLICATION_PACKAGE; import static com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException.ErrorCode.OUT_OF_CAPACITY; +import static com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException.ErrorCode.PARENT_HOST_NOT_READY; import static com.yahoo.vespa.hosted.controller.api.integration.configserver.Node.State.active; import static com.yahoo.vespa.hosted.controller.api.integration.configserver.Node.State.reserved; import static com.yahoo.vespa.hosted.controller.deployment.RunStatus.aborted; @@ -220,7 +221,8 @@ public class InternalStepRunner implements StepRunner { catch (ConfigServerException e) { if ( e.getErrorCode() == OUT_OF_CAPACITY && type.isTest() || e.getErrorCode() == ACTIVATION_CONFLICT - || e.getErrorCode() == APPLICATION_LOCK_FAILURE) { + || e.getErrorCode() == APPLICATION_LOCK_FAILURE + || e.getErrorCode() == PARENT_HOST_NOT_READY) { logger.log("Will retry, because of '" + e.getErrorCode() + "' deploying:\n" + e.getMessage()); return Optional.empty(); } |