diff options
author | Harald Musum <musum@yahooinc.com> | 2023-06-01 16:33:11 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-06-01 16:33:11 +0200 |
commit | 95a1d82254a7f05b71cb4ff2ace40958bfbe0212 (patch) | |
tree | 291798859dcbaed9a5527289016c7ead0c32a33b /clustercontroller-core/src/test/java | |
parent | 4cae2ecf6c9c5ac7f329a112451909d0f7ac3950 (diff) |
Copy options when reconfiguring
Diffstat (limited to 'clustercontroller-core/src/test/java')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java | 30 |
1 files changed, 10 insertions, 20 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 02e3a4a4125..f146d2468c8 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 @@ -281,10 +281,8 @@ public class RpcServerTest extends FleetControllerTest { configuredNodes.add(new ConfiguredNode(i, true)); configuredNodes.add(new ConfiguredNode(5, false)); configuredNodes.add(new ConfiguredNode(6, false)); - FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes) - .setSlobrokConnectionSpecs(this.options.slobrokConnectionSpecs()) - .setMaxInitProgressTime(30000) - .setStableStateTimePeriod(60000); + var builder = FleetControllerOptions.Builder.copy(fleetController().getOptions()) + .setNodes(configuredNodes); fleetController().updateOptions(builder.build()); waitForState("version:\\d+ distributor:7 storage:7 .0.s:m .1.s:m .2.s:r .3.s:r .4.s:r"); } @@ -311,10 +309,8 @@ public class RpcServerTest extends FleetControllerTest { Set<ConfiguredNode> configuredNodes = new TreeSet<>(); for (int i = 0; i < 7; i++) configuredNodes.add(new ConfiguredNode(i, false)); - FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes) - .setSlobrokConnectionSpecs(this.options.slobrokConnectionSpecs()) - .setMaxInitProgressTime(30000) - .setStableStateTimePeriod(60000); + var builder = FleetControllerOptions.Builder.copy(fleetController().getOptions()) + .setNodes(configuredNodes); fleetController().updateOptions(builder.build()); waitForState("version:\\d+ distributor:7 storage:7 .0.s:m .1.s:m"); } @@ -349,10 +345,8 @@ public class RpcServerTest extends FleetControllerTest { Set<ConfiguredNode> configuredNodes = new TreeSet<>(); for (int i = 0; i < 5; i++) configuredNodes.add(new ConfiguredNode(i, false)); - FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes) - .setSlobrokConnectionSpecs(options.slobrokConnectionSpecs()) - .setMaxInitProgressTime(30000) - .setStableStateTimePeriod(60000); + var builder = FleetControllerOptions.Builder.copy(fleetController().getOptions()) + .setNodes(configuredNodes); fleetController().updateOptions(builder.build()); waitForState("version:\\d+ distributor:5 storage:5"); } @@ -364,10 +358,8 @@ public class RpcServerTest extends FleetControllerTest { configuredNodes.add(new ConfiguredNode(i, true)); configuredNodes.add(new ConfiguredNode(5, false)); configuredNodes.add(new ConfiguredNode(6, false)); - FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes) - .setSlobrokConnectionSpecs(options.slobrokConnectionSpecs()) - .setMaxInitProgressTime(30000) - .setStableStateTimePeriod(60000); + var builder = FleetControllerOptions.Builder.copy(fleetController().getOptions()) + .setNodes(configuredNodes); fleetController().updateOptions(builder.build()); waitForState("version:\\d+ distributor:7 storage:7 .0.s:r .1.s:r .2.s:r .3.s:r .4.s:r"); } @@ -378,10 +370,8 @@ public class RpcServerTest extends FleetControllerTest { configuredNodes.add(new ConfiguredNode(i, true)); configuredNodes.add(new ConfiguredNode(5, false)); configuredNodes.add(new ConfiguredNode(6, false)); - FleetControllerOptions.Builder builder = defaultOptions("mycluster", configuredNodes) - .setSlobrokConnectionSpecs(options.slobrokConnectionSpecs()) - .setMaxInitProgressTime(30000) - .setStableStateTimePeriod(60000); + var builder = FleetControllerOptions.Builder.copy(fleetController().getOptions()) + .setNodes(configuredNodes); fleetController().updateOptions(builder.build()); waitForState("version:\\d+ distributor:7 storage:7 .0.s:r .1.s:r .2.s:r .3.s:r .4.s:r"); } |