diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-07-06 13:09:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-06 13:09:39 +0200 |
| commit | a4d44297d262e04958b71c34cbad584573b1beae (patch) | |
| tree | b93ecc62db869fa025a4fa53e8b3f1f19df264e2 /controller-server | |
| parent | ae850c9071ff5a955191f596e4994dba4341fafc (diff) | |
| parent | 6a5c2167977fd99ed0502f732fff9e20cf3e0900 (diff) | |
Merge pull request #6352 from vespa-engine/jvenstad/deployment-pipeline
Expand Node interface and check for pending re[boot|start|s
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 16 |
1 files changed, 11 insertions, 5 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 e6f2263b8eb..77b6baa6bea 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 @@ -261,12 +261,18 @@ public class InternalStepRunner implements StepRunner { List<Node> nodes = controller.configServer().nodeRepository().list(zone(type), id, Arrays.asList(active, reserved)); for (Node node : nodes) // TODO jvenstad: Add ALLOWED_TO_BE_DOWN and reboot and restart generation information as well. - logger.get().log(String.format("%70s: %s%s", + logger.get().log(String.format("%70s: %-12s%-25s%-32s%s", node.hostname(), - node.wantedVersion(), - node.currentVersion().equals(node.wantedVersion()) ? "" : " <-- " + node.currentVersion())); - - return nodes.stream().allMatch(node -> target.equals(node.currentVersion())); + node.serviceState(), + node.wantedVersion() + (node.currentVersion().equals(node.wantedVersion()) ? "" : " <-- " + node.currentVersion()), + node.restartGeneration() == node.wantedRestartGeneration() ? "" + : "restart pending (" + node.wantedRestartGeneration() + " <-- " + node.restartGeneration() + ")", + node.rebootGeneration() == node.wantedRebootGeneration() ? "" + : "reboot pending (" + node.wantedRebootGeneration() + " <-- " + node.rebootGeneration() + ")")); + + return nodes.stream().allMatch(node -> node.currentVersion().equals(target) + && node.restartGeneration() == node.wantedRestartGeneration() + && node.rebootGeneration() == node.wantedRebootGeneration()); } private boolean servicesConverged(ApplicationId id, JobType type) { |