From 0dae4ed807b19bf558b508bac057ae479b71c492 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 29 Mar 2023 15:17:43 +0200 Subject: MInor changes after code review --- .../clustercontroller/core/NodeStateChangeCheckerTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java index cb5f397b890..e789a3cc6a6 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java @@ -161,7 +161,7 @@ public class NodeStateChangeCheckerTest { @Test void testSafeMaintenanceDisallowedWhenOtherDistributorInFlatClusterIsSuspended() { - // Nodes 0-3, distributor 0 being in maintenance with "Orchestrator" description. + // Nodes 0-3, distributor 0 being down with "Orchestrator" description. ContentCluster cluster = createCluster(4); cluster.clusterInfo().getDistributorNodeInfo(0) .setWantedState(new NodeState(DISTRIBUTOR, DOWN).setDescription("Orchestrator")); @@ -731,9 +731,9 @@ public class NodeStateChangeCheckerTest { var configBuilder = new StorDistributionConfig.Builder() .active_per_leaf_group(true) - .ready_copies(2) - .redundancy(2) - .initial_redundancy(2); + .ready_copies(groups) + .redundancy(groups) + .initial_redundancy(groups); configBuilder.group(new StorDistributionConfig.Group.Builder() .index("invalid") @@ -741,14 +741,13 @@ public class NodeStateChangeCheckerTest { .capacity(nodes) .partitions("1|*")); - int nodeIndex = 0; for (int i = 0; i < groups; ++i) { var groupBuilder = new StorDistributionConfig.Group.Builder() .index(String.valueOf(i)) .name(String.valueOf(i)) .capacity(nodesPerGroup) .partitions(""); - for (int j = 0; j < nodesPerGroup; ++j, ++nodeIndex) { + for (int nodeIndex = 0; nodeIndex < nodesPerGroup; ++nodeIndex) { groupBuilder.nodes(new StorDistributionConfig.Group.Nodes.Builder() .index(nodeIndex)); } -- cgit v1.2.3