Merge pull request #7885 from vespa-engine/jvenstad/more-precise-convergence-logging

Jvenstad/more precise convergence logging

2 files changed, 9 insertions, 3 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 e1ce982b75c..21b110acad1 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
@@ -245,7 +245,8 @@ public class InternalStepRunner implements StepRunner {
         ApplicationVersion application = setTheStage ? versions.sourceApplication().orElse(versions.targetApplication()) : versions.targetApplication();
         logger.log("Checking installation of " + platform + " and " + application.id() + " ...");
 
-        if (nodesConverged(id.application(), id.type(), platform, logger) && servicesConverged(id.application(), id.type(), logger)) {
+        if (   nodesConverged(id.application(), id.type(), platform, logger)
+            && servicesConverged(id.application(), id.type(), logger)) {
             logger.log("Installation succeeded!");
             return Optional.of(running);
         }
@@ -266,8 +267,10 @@ public class InternalStepRunner implements StepRunner {
             return Optional.of(error);
         }
 
+        Version platform = controller.jobController().run(id).get().versions().targetPlatform();
         logger.log("Checking installation of tester container ...");
-        if (servicesConverged(id.tester().id(), id.type(), logger)) {
+        if (   nodesConverged(id.tester().id(), id.type(), platform, logger)
+            && servicesConverged(id.tester().id(), id.type(), logger)) {
             logger.log("Tester container successfully installed!");
             return Optional.of(running);
         }
@@ -313,7 +316,7 @@ public class InternalStepRunner implements StepRunner {
                                                     serviceStatus.host().value(),
                                                     serviceStatus.type(),
                                                     serviceStatus.port(),
-                                                    serviceStatus.currentGeneration() == -1 ? "(unknown)" : Long.toString(serviceStatus.currentGeneration())))
+                                                    serviceStatus.currentGeneration() == -1 ? "not started!" : Long.toString(serviceStatus.currentGeneration())))
                 .collect(Collectors.toList());
         logger.log(statuses);
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
index e3b5e1a7942..4433e893325 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
@@ -192,6 +192,9 @@ public class InternalDeploymentTester {
         assertEquals(Step.Status.succeeded, jobs.active(run.id()).get().steps().get(Step.installReal));
 
         assertEquals(unfinished, jobs.active(run.id()).get().steps().get(Step.installTester));
+        tester.configServer().nodeRepository().doUpgrade(new DeploymentId(testerId.id(), zone), Optional.empty(), run.versions().targetPlatform());
+        runner.run();
+        assertEquals(unfinished, jobs.active(run.id()).get().steps().get(Step.installTester));
         tester.configServer().convergeServices(testerId.id(), zone);
         runner.run();
         assertEquals(Step.Status.succeeded, jobs.active(run.id()).get().steps().get(Step.installTester));