aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-03-26 20:45:31 +0200
committerHarald Musum <musum@yahooinc.com>2023-03-26 20:45:31 +0200
commitbd8b7119a3d65cbde90141f09742f292f4c77b90 (patch)
tree26bab6ff5957a59f657739b60c9e1c640c63d2b0
parentd54d0fb7311458ec06fb5f43b5742289509d6aad (diff)
Remove argument that is always false
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java13
1 files changed, 2 insertions, 11 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 fa38462621a..757aced0fc0 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
@@ -486,18 +486,13 @@ public class NodeStateChangeCheckerTest {
assertFalse(result.wantedStateAlreadySet());
}
- private Result transitionToMaintenanceWithOneStorageNodeDown(
- int storageNodeIndex, boolean alternatingUpRetiredAndInitializing) {
+ private Result transitionToMaintenanceWithOneStorageNodeDown(int storageNodeIndex) {
ContentCluster cluster = createCluster(4);
NodeStateChangeChecker nodeStateChangeChecker = createChangeChecker(cluster);
for (int x = 0; x < cluster.clusterInfo().getConfiguredNodes().size(); x++) {
State state = UP;
// Pick some retired and initializing nodes too
- if (alternatingUpRetiredAndInitializing) { // TODO: Move this into the calling test
- if (x % 3 == 1) state = State.RETIRED;
- else if (x % 3 == 2) state = INITIALIZING;
- }
cluster.clusterInfo().getDistributorNodeInfo(x).setReportedState(new NodeState(DISTRIBUTOR, state), 0);
cluster.clusterInfo().getDistributorNodeInfo(x).setHostInfo(HostInfo.createHostInfo(createDistributorHostInfo(4, 5, 6)));
cluster.clusterInfo().getStorageNodeInfo(x).setReportedState(new NodeState(STORAGE, state), 0);
@@ -524,12 +519,8 @@ public class NodeStateChangeCheckerTest {
}
}
- private Result transitionToMaintenanceWithOneStorageNodeDown(int storageNodeIndex) {
- return transitionToMaintenanceWithOneStorageNodeDown(storageNodeIndex, false);
- }
-
private Result transitionToMaintenanceWithNoStorageNodesDown() {
- return transitionToMaintenanceWithOneStorageNodeDown(-1, false);
+ return transitionToMaintenanceWithOneStorageNodeDown(-1);
}
@Test