diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-08-31 13:37:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-31 13:37:14 +0200 |
commit | f9e08944e87f49ae474c0f55bd64d8c709fb2cf6 (patch) | |
tree | b7d94c3cef91f9d24d6efc50fdcd969f5faf89c2 /clustercontroller-core/src/test/java/com/yahoo | |
parent | 50b1266d2f1150dc7ed84d4f088c0c065b9eb935 (diff) | |
parent | aaff62d168f0137735ddac37ce4a2f715e6411b5 (diff) |
Merge pull request #23862 from vespa-engine/hmusum/cleanup-21
Cluster controller cleanup, part 8 [run-systemtest]
Diffstat (limited to 'clustercontroller-core/src/test/java/com/yahoo')
2 files changed, 4 insertions, 3 deletions
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); } } } |