From c6745b5664382049528febda569400930f245475 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 1 Jun 2023 23:38:17 +0200 Subject: ZooKeeper is always used, simplify --- .../core/ClusterFeedBlockTest.java | 16 +++++++------ .../clustercontroller/core/MasterElectionTest.java | 2 -- .../clustercontroller/core/NoZooKeeperTest.java | 26 ---------------------- 3 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java (limited to 'clustercontroller-core/src/test/java') diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java index d4eea261767..55e256cf89c 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFeedBlockTest.java @@ -32,15 +32,17 @@ public class ClusterFeedBlockTest extends FleetControllerTest { private FleetController ctrl; private DummyCommunicator communicator; - private void initialize(FleetControllerOptions options) throws Exception { + private void initialize(FleetControllerOptions.Builder builder) throws Exception { List nodes = new ArrayList<>(); - for (int i = 0; i < options.nodes().size(); ++i) { + for (int i = 0; i < builder.nodes().size(); ++i) { nodes.add(new Node(NodeType.STORAGE, i)); nodes.add(new Node(NodeType.DISTRIBUTOR, i)); } - var context = new TestFleetControllerContext(options); communicator = new DummyCommunicator(nodes, timer); + setUpZooKeeperServer(builder); + options = builder.build(); + var context = new TestFleetControllerContext(options); boolean start = false; ctrl = createFleetController(timer, options, context, communicator, communicator, null, start); @@ -57,16 +59,16 @@ public class ClusterFeedBlockTest extends FleetControllerTest { ctrl.tick(); } - private static FleetControllerOptions createOptions(Map feedBlockLimits, double clusterFeedBlockNoiseLevel) { + private static FleetControllerOptions.Builder createOptions(Map feedBlockLimits, double clusterFeedBlockNoiseLevel) { return defaultOptions() .setStorageDistribution(DistributionBuilder.forFlatCluster(NODE_COUNT)) .setNodes(new HashSet<>(DistributionBuilder.buildConfiguredNodes(NODE_COUNT))) .setClusterFeedBlockEnabled(true) .setClusterFeedBlockLimit(feedBlockLimits) - .setClusterFeedBlockNoiseLevel(clusterFeedBlockNoiseLevel).build(); + .setClusterFeedBlockNoiseLevel(clusterFeedBlockNoiseLevel); } - private static FleetControllerOptions createOptions(Map feedBlockLimits) { + private static FleetControllerOptions.Builder createOptions(Map feedBlockLimits) { return createOptions(feedBlockLimits, 0.0); } @@ -109,7 +111,7 @@ public class ClusterFeedBlockTest extends FleetControllerTest { assertTrue(ctrl.getClusterStateBundle().clusterFeedIsBlocked()); // Increase cheese allowance. Should now automatically unblock since reported usage is lower. - ctrl.updateOptions(createOptions(mapOf(usage("cheese", 0.9), usage("wine", 0.4)))); + ctrl.updateOptions(createOptions(mapOf(usage("cheese", 0.9), usage("wine", 0.4))).build()); ctrl.tick(); // Options propagation ctrl.tick(); // State recomputation assertFalse(ctrl.getClusterStateBundle().clusterFeedIsBlocked()); 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 77c89d77ba5..93a96be71a0 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 @@ -6,7 +6,6 @@ import com.yahoo.jrt.Spec; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.jrt.Transport; -import com.yahoo.jrt.slobrok.server.Slobrok; import com.yahoo.vdslib.state.ClusterState; import com.yahoo.vdslib.state.NodeState; import com.yahoo.vdslib.state.NodeType; @@ -53,7 +52,6 @@ public class MasterElectionTest extends FleetControllerTest { if (zooKeeperServer == null) { zooKeeperServer = new ZooKeeperTestServer(); } - slobrok = new Slobrok(); builder.setZooKeeperSessionTimeout(defaultZkSessionTimeoutInMillis()) .setZooKeeperServerAddress(zooKeeperServer.getAddress()) .setSlobrokConnectionSpecs(getSlobrokConnectionSpecs(slobrok)) diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java deleted file mode 100644 index 3d3a38aacd4..00000000000 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NoZooKeeperTest.java +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.clustercontroller.core; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -public class NoZooKeeperTest extends FleetControllerTest { - - @Test - void testWantedStatesInZooKeeper() throws Exception { - // Null is the default for zooKeeperServerAddress - FleetControllerOptions.Builder builder = defaultOptions(); - Timer timer = new FakeTimer(); - setUpFleetController(timer, builder); - setUpVdsNodes(timer); - waitForStableSystem(); - - assertTrue(nodes.get(0).isDistributor()); - nodes.get(0).disconnect(); - waitForState("version:\\d+ distributor:10 .0.s:d storage:10"); - - nodes.get(0).connect(); - waitForState("version:\\d+ distributor:10 storage:10"); - } -} -- cgit v1.2.3