From 1ae00585c5bd6a9af93f875ee781760d0fe88c66 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Wed, 20 Oct 2021 09:15:59 +0200 Subject: Revert changes to config generation --- .../vespa/clustercontroller/core/DistributionBitCountTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java') diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java index e8f20a00d24..e38e48375ed 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DistributionBitCountTest.java @@ -7,11 +7,12 @@ import com.yahoo.vdslib.state.NodeState; import com.yahoo.vdslib.state.NodeType; import com.yahoo.vdslib.state.State; import org.junit.Test; -import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; +import static org.junit.Assert.assertEquals; + public class DistributionBitCountTest extends FleetControllerTest { private void setUpSystem(String testName) throws Exception { @@ -39,12 +40,12 @@ public class DistributionBitCountTest extends FleetControllerTest { public void testDistributionBitCountConfigIncrease() throws Exception { setUpSystem("DistributionBitCountTest::testDistributionBitCountConfigIncrease"); options.distributionBits = 20; - fleetController.updateOptions(options); + fleetController.updateOptions(options, 0); ClusterState currentState = waitForState("version:\\d+ bits:20 distributor:10 storage:10"); int version = currentState.getVersion(); options.distributionBits = 23; - fleetController.updateOptions(options); + fleetController.updateOptions(options, 0); assertEquals(version, currentState.getVersion()); } @@ -55,7 +56,7 @@ public class DistributionBitCountTest extends FleetControllerTest { public void testDistributionBitCountConfigDecrease() throws Exception { setUpSystem("DistributionBitCountTest::testDistributionBitCountConfigDecrease"); options.distributionBits = 12; - fleetController.updateOptions(options); + fleetController.updateOptions(options, 0); waitForState("version:\\d+ bits:12 distributor:10 storage:10"); } -- cgit v1.2.3