Merge pull request #23862 from vespa-engine/hmusum/cleanup-21

Cluster controller cleanup, part 8 [run-systemtest]

3 files changed, 10 insertions, 4 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index a1e213fc1f9..712c86f1e15 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -1139,6 +1139,7 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta
         public NodeListener getNodeStateUpdateListener() { return FleetController.this; }
     };
 
+    // For testing only
     public void waitForCompleteCycle(Duration timeout) {
         Instant endTime = Instant.now().plus(timeout);
         synchronized (monitor) {
@@ -1151,7 +1152,11 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta
                         throw new IllegalStateException("Timed out waiting for cycle to complete. Not completed after " + timeout);
                     if ( !isRunning() )
                         throw new IllegalStateException("Fleetcontroller not running. Will never complete cycles");
-                    try{ monitor.wait(100); } catch (InterruptedException e) {}
+                    try {
+                        monitor.wait(100);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
             } finally {
                 waitingForCycle = false;
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
index fd24966e26a..e0c85036bf4 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
@@ -100,7 +100,7 @@ public class DummyVdsNode {
                             log.log(Level.FINE, () -> "Dummy node " + DummyVdsNode.this + ": Responding to node state request at time " + currentTime);
                             r.request.returnValues().add(new StringValue(nodeState.serialize()));
                             if (r.request.methodName().equals("getnodestate3")) {
-                                r.request.returnValues().add(new StringValue("No host info in dummy implementation"));
+                                r.request.returnValues().add(new StringValue(hostInfo));
                             }
                             r.request.returnRequest();
                             it.remove();
@@ -383,7 +383,7 @@ public class DummyVdsNode {
              if (r.request.parameters().size() > 2 && r.request.parameters().get(2).asInt32() == index) {
                  log.log(Level.FINE, () -> "Dummy node " + DummyVdsNode.this + ": Responding to node state reply from controller " + index + " as we received new one");
                  r.request.returnValues().add(new StringValue(nodeState.serialize()));
-                 r.request.returnValues().add(new StringValue("No host info from dummy implementation"));
+                 r.request.returnValues().add(new StringValue(hostInfo));
                  r.request.returnRequest();
                  it.remove();
                  ++outdatedStateReplies;
@@ -416,7 +416,7 @@ public class DummyVdsNode {
                     log.log(Level.FINE, () -> "Dummy node " + this + ": Request had " + (givenState == null ? "no state" : "different state(" + givenState +")") + ". Answering with " + nodeState);
                     req.returnValues().add(new StringValue(nodeState.serialize()));
                     if (req.methodName().equals("getnodestate3")) {
-                        req.returnValues().add(new StringValue("Dummy node host info"));
+                        req.returnValues().add(new StringValue(hostInfo));
                     }
                     ++immediateStateReplies;
                 }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
index 7960cd7c9d2..e4df6f31987 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
@@ -117,6 +117,7 @@ public interface Waiter {
                         if (allowWait)
                             data.getMonitor().wait(wt == null ? WaitTask.defaultTaskFrequencyMillis : Math.min(wt.getWaitTaskFrequencyInMillis(), timeLeft.toMillis()));
                     } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
                     }
                 }
             }