aboutsummaryrefslogtreecommitdiffstats
path: root/clustercontroller-core/src/test/java
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-04-12 09:23:49 +0200
committerHarald Musum <musum@yahooinc.com>2023-04-12 09:23:49 +0200
commit9a71eb340d65db6b8fb8a815e3a913708d57e2c1 (patch)
tree1e891ae5998fc80261e43e244cbef9835b9314c2 /clustercontroller-core/src/test/java
parent1e54445b9fcfc31cfdbd421575f7d49fd51e1c56 (diff)
Reimplement checking of other nodes and nodes in groups being not up
Diffstat (limited to 'clustercontroller-core/src/test/java')
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java6
1 files changed, 3 insertions, 3 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 0a3d3bde937..1d28a90352b 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
@@ -114,7 +114,7 @@ public class NodeStateChangeCheckerTest {
}
@Test
- void testCanUpgradeForce() {
+ void testCanUpgradeWithForce() {
var nodeStateChangeChecker = createChangeChecker(createCluster(1));
NodeState newState = new NodeState(STORAGE, INITIALIZING);
Result result = nodeStateChangeChecker.evaluateTransition(
@@ -201,7 +201,7 @@ public class NodeStateChangeCheckerTest {
Result result = nodeStateChangeChecker.evaluateTransition(node, clusterState, SAFE, UP_NODE_STATE, MAINTENANCE_NODE_STATE);
assertFalse(result.settingWantedStateIsAllowed(), result.toString());
assertFalse(result.wantedStateAlreadySet());
- assertEquals("Nodes in 2 groups are already down, cannot take down another node", result.getReason());
+ assertEquals("At most nodes in 2 groups can have wanted state", result.getReason());
}
}
@@ -249,7 +249,7 @@ public class NodeStateChangeCheckerTest {
Result result = nodeStateChangeChecker.evaluateTransition(node, clusterState, SAFE, UP_NODE_STATE, MAINTENANCE_NODE_STATE);
assertFalse(result.settingWantedStateIsAllowed(), result.toString());
assertFalse(result.wantedStateAlreadySet());
- assertEquals("Nodes in 2 groups are already down, cannot take down another node", result.getReason());
+ assertEquals("At most nodes in 2 groups can have wanted state", result.getReason());
}
// 2 nodes in group 0 and 1 in group 1 in maintenance, try to set storage node 3 in group 1 to maintenance