diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-01-15 09:29:05 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-01-15 09:29:05 +0100 |
| commit | 7fc89e5de6f586483346864dddd3e963b7e2c6c6 (patch) | |
| tree | 055793fb702d70b8377c5192a0bc256968f1e1a9 | |
| parent | 322336c293523e43aad46e4cd0b542d69bff27bd (diff) | |
Relax requirement to geq rather than eq
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 8 |
1 files changed, 4 insertions, 4 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 81a4e30feac..1956a56a6a5 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 @@ -300,16 +300,16 @@ public class InternalStepRunner implements StepRunner { node.hostname(), node.serviceState(), node.wantedVersion() + (node.currentVersion().equals(node.wantedVersion()) ? "" : " <-- " + node.currentVersion()), - node.restartGeneration() == node.wantedRestartGeneration() ? "" + node.restartGeneration() >= node.wantedRestartGeneration() ? "" : "restart pending (" + node.wantedRestartGeneration() + " <-- " + node.restartGeneration() + ")", - node.rebootGeneration() == node.wantedRebootGeneration() ? "" + node.rebootGeneration() >= node.wantedRebootGeneration() ? "" : "reboot pending (" + node.wantedRebootGeneration() + " <-- " + node.rebootGeneration() + ")")) .collect(Collectors.toList()); logger.log(statuses); return nodes.stream().allMatch(node -> node.currentVersion().equals(target) - && node.restartGeneration() == node.wantedRestartGeneration() - && node.rebootGeneration() == node.wantedRebootGeneration()); + && node.restartGeneration() >= node.wantedRestartGeneration() + && node.rebootGeneration() >= node.wantedRebootGeneration()); } private boolean servicesConverged(ApplicationId id, JobType type, DualLogger logger) { |