From 35e3812e05be91f0b651498b47db4378280c9afa Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 12 Aug 2022 14:39:29 +0200 Subject: getSeconds() -> timeoutInSeconds() --- .../yahoo/vespa/clustercontroller/core/FleetControllerTest.java | 2 +- .../yahoo/vespa/clustercontroller/core/MasterElectionTest.java | 8 ++++---- .../com/yahoo/vespa/clustercontroller/core/RpcServerTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java index 9877a76a6f2..41ae2b37411 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java @@ -460,7 +460,7 @@ public abstract class FleetControllerTest implements Waiter { Request req = new Request("setNodeState"); req.parameters().add(new StringValue(node.getSlobrokName())); req.parameters().add(new StringValue(ns.serialize())); - connection.invokeSync(req, timeout.getSeconds()); + connection.invokeSync(req, timeoutInSeconds()); if (req.isError()) { fail("Failed to invoke setNodeState(): " + req.errorCode() + ": " + req.errorMessage()); } diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java index 36884892895..05a06a92e27 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java @@ -313,7 +313,7 @@ public class MasterElectionTest extends FleetControllerTest { boolean allOk = true; for (int node : nodes) { Request req = new Request("getMaster"); - connections.get(node).invokeSync(req, timeout().getSeconds()); + connections.get(node).invokeSync(req, timeoutInSeconds()); if (req.isError()) { allOk = false; break; @@ -356,7 +356,7 @@ public class MasterElectionTest extends FleetControllerTest { Request req = new Request("getMaster"); for (int nodeIndex = 0; nodeIndex < 3; ++nodeIndex) { - for (int retry = 0; retry < timeout().getSeconds() * 10; ++retry) { + for (int retry = 0; retry < timeoutInSeconds() * 10; ++retry) { req = new Request("getMaster"); connections.get(nodeIndex).invokeSync(req, timeoutInSeconds()); assertFalse(req.isError(), req.errorMessage()); @@ -393,7 +393,7 @@ public class MasterElectionTest extends FleetControllerTest { assertEquals(104, req.errorCode(), req.toString()); assertEquals("Connection error", req.errorMessage(), req.toString()); - for (int i = 0; i < timeout().getSeconds() * 10; ++i) { + for (int i = 0; i < timeoutInSeconds() * 10; ++i) { req = new Request("getMaster"); connections.get(1).invokeSync(req, timeoutInSeconds()); assertFalse(req.isError(), req.errorMessage()); @@ -403,7 +403,7 @@ public class MasterElectionTest extends FleetControllerTest { assertEquals(1, req.returnValues().get(0).asInt32(), req.toString()); assertEquals("2 of 3 nodes agree 1 is master.", req.returnValues().get(1).asString(), req.toString()); - for (int i = 0; i < timeout().getSeconds() * 10; ++i) { + for (int i = 0; i < timeoutInSeconds() * 10; ++i) { req = new Request("getMaster"); connections.get(2).invokeSync(req, timeoutInSeconds()); assertFalse(req.isError(), req.errorMessage()); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java index fd56f0d0143..594a681f4b5 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java @@ -127,7 +127,7 @@ public class RpcServerTest extends FleetControllerTest { assertTrue(connection.isValid()); Request req = new Request("getSystemState"); - connection.invokeSync(req, timeout().getSeconds()); + connection.invokeSync(req, timeoutInSeconds()); assertEquals(ErrorCode.NONE, req.errorCode(), req.toString()); assertTrue(req.checkReturnTypes("ss"), req.toString()); String systemState = req.returnValues().get(1).asString(); -- cgit v1.2.3