diff options
author | Harald Musum <musum@yahooinc.com> | 2023-05-26 10:39:23 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-05-26 10:39:23 +0200 |
commit | 97f818a7954269d8eb80351273c76d1ae684e900 (patch) | |
tree | 526db1c0b162e74c5b8b90423d9df60212539980 /clustercontroller-core/src/test/java/com | |
parent | 5f0b4c0461d74738e4969e97563d4a7c962f2174 (diff) |
Remove RPC method only used in tests
Diffstat (limited to 'clustercontroller-core/src/test/java/com')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java | 45 |
1 files changed, 1 insertions, 44 deletions
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 cc9c3f84de3..02e3a4a4125 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 @@ -23,6 +23,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; + import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -33,7 +34,6 @@ import java.util.stream.Collectors; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -492,49 +492,6 @@ public class RpcServerTest extends FleetControllerTest { // Note that this feature is tested better in MasterElectionTest.testGetMaster as it has multiple fleetcontrollers } - @Test - void testGetNodeList() throws Exception { - setUpFleetController(timer, defaultOptions(5)); - final int nodeCount = 5; - setUpVdsNodes(timer, false, nodeCount); - waitForStableSystem(); - - assertTrue(nodes.get(0).isDistributor()); - nodes.get(0).disconnect(); - waitForState("version:\\d+ distributor:5 .0.s:d storage:5"); - - int rpcPort = fleetController().getRpcPort(); - Target connection = supervisor.connect(new Spec("localhost", rpcPort)); - assertTrue(connection.isValid()); - - Request req = new Request("getNodeList"); - connection.invokeSync(req, timeout()); - assertEquals(ErrorCode.NONE, req.errorCode(), req.errorMessage()); - assertTrue(req.checkReturnTypes("SS"), req.toString()); - String[] slobrok = req.returnValues().get(0).asStringArray().clone(); - String[] rpc = req.returnValues().get(1).asStringArray().clone(); - - assertEquals(2 * nodeCount, slobrok.length); - assertEquals(2 * nodeCount, rpc.length); - - // Verify that we can connect to all addresses returned. - for (int i = 0; i < 2 * nodeCount; ++i) { - if (slobrok[i].equals("storage/cluster.mycluster/distributor/0")) { - if (i < nodeCount && !"".equals(rpc[i])) { - continue; - } - assertEquals("", rpc[i], slobrok[i]); - continue; - } - assertNotEquals("", rpc[i]); - Request req2 = new Request("getnodestate3"); - req2.parameters().add(new StringValue("unknown")); - Target connection2 = supervisor.connect(new Spec(rpc[i])); - connection2.invokeSync(req2, timeout()); - assertEquals(ErrorCode.NONE, req.errorCode(), req2.toString()); - } - } - private Request setNodeState(String node, NodeState newNodeState, Target connection) { return setNodeState(node, newNodeState.serialize(true), connection); } |