summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2021-03-03 15:16:31 +0100
committerGitHub <noreply@github.com>2021-03-03 15:16:31 +0100
commit171ba1e286e9ad00b2fac50d0f94aec5887f7afa (patch)
tree43cb21930e144915e3f1758e1b945f7f45fbdd3f
parentd8930ed3c9bb4a897121e550cde520366ca19c8f (diff)
parentbe407c5c07cee112832de9de00f597c5c4406587 (diff)
Merge pull request #16760 from vespa-engine/hmusum/print-node-index-without-parentheses
Print node index without parenthesis as done elsewhere
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java12
-rw-r--r--clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeCheckerTest.java2
2 files changed, 7 insertions, 7 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
index ca3169ede6f..918f01eef16 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java
@@ -334,13 +334,13 @@ public class NodeStateChangeChecker {
for (DistributorNodeInfo distributorNodeInfo : clusterInfo.getDistributorNodeInfo()) {
Integer distributorClusterStateVersion = distributorNodeInfo.getHostInfo().getClusterStateVersionOrNull();
if (distributorClusterStateVersion == null) {
- return Result.createDisallowed("Distributor node (" + distributorNodeInfo.getNodeIndex()
- + ") has not reported any cluster state version yet.");
+ return Result.createDisallowed("Distributor node " + distributorNodeInfo.getNodeIndex()
+ + " has not reported any cluster state version yet.");
} else if (distributorClusterStateVersion != clusterStateVersion) {
- return Result.createDisallowed("Distributor node (" + distributorNodeInfo.getNodeIndex()
- + ") does not report same version ("
- + distributorNodeInfo.getHostInfo().getClusterStateVersionOrNull()
- + ") as fleetcontroller has (" + clusterStateVersion + ")");
+ return Result.createDisallowed("Distributor node " + distributorNodeInfo.getNodeIndex()
+ + " does not report same version ("
+ + distributorNodeInfo.getHostInfo().getClusterStateVersionOrNull()
+ + ") as fleetcontroller (" + clusterStateVersion + ")");
}
List<StorageNode> storageNodes = distributorNodeInfo.getHostInfo().getDistributor().getStorageNodes();
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 3f654d36246..41284cc95d0 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
@@ -273,7 +273,7 @@ public class NodeStateChangeCheckerTest {
nodeStorage, defaultAllUpClusterState(), SetUnitStateRequest.Condition.SAFE, UP_NODE_STATE, MAINTENANCE_NODE_STATE);
assertFalse(result.settingWantedStateIsAllowed());
assertFalse(result.wantedStateAlreadySet());
- assertThat(result.getReason(), is("Distributor node (0) has not reported any cluster state version yet."));
+ assertThat(result.getReason(), is("Distributor node 0 has not reported any cluster state version yet."));
}
private NodeStateChangeChecker.Result transitionToSameState(State state, String oldDescription, String newDescription) {