aboutsummaryrefslogtreecommitdiffstats
path: root/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@oath.com>2017-10-21 02:35:54 +0200
committerHåkon Hallingstad <hakon@oath.com>2017-10-21 02:35:54 +0200
commit133616e0bdbc44d8094d4365b5ba2c96560ded33 (patch)
treee5fa868918e84f5a40eaa401b650dd348f458b40 /clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
parent10aab525559a7d4649cd181e8adca0010c3041dc (diff)
Also set the distributor wanted state when safe-setting the storage node state
This is done as part of the SAFE REST API call to set the node state of a storage node to ensure atomicity of the state change, reduce the number of state changes, and minimize the time to complete the state changes. The right way to think about the safe-set is then: In order to safely set a storage node to (e.g.) maintenance, the distributor will also have to be set to down. And so on for the various permutations of state transitions.
Diffstat (limited to 'clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java')
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
index ad7da755b98..0ff59c26c13 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
@@ -206,7 +206,6 @@ public class ContentCluster {
}
public boolean hasConfiguredNode(int index) {
- return clusterInfo.getConfiguredNodes().containsKey(index);
+ return clusterInfo.hasConfiguredNode(index);
}
-
}