diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-08-30 08:46:06 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-08-30 08:46:06 +0200 |
commit | 8d32f55ec5fb5066108356bba7d6565cfd9b547c (patch) | |
tree | 91135e8d4a49899b5bff8e4127445017f343f134 /configserver/src | |
parent | 114f42cb0ea790bc758b779f8c747184b68bfe2b (diff) |
Revert "Merge pull request #6726 from vespa-engine/revert-6719-bratseth/initially-down"
This reverts commit 05ea4c2b9952bceaf0e009053c2f51a09d15a957, reversing
changes made to 03efdabdc9f0e43fc2c362569ae455a7abc9a64b.
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java index 46be61964ce..7ec93c0cf98 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java @@ -39,7 +39,6 @@ import java.util.concurrent.TimeUnit; public class ConfigServerBootstrap extends AbstractComponent implements Runnable { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(ConfigServerBootstrap.class.getName()); - private static final String vipStatusClusterIdentifier = "configserver"; enum MainThread {START, DO_NOT_START} enum RedeployingApplicationsFails {EXIT_JVM, CONTINUE} @@ -140,18 +139,18 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable private void up() { stateMonitor.status(StateMonitor.Status.up); - vipStatus.addToRotation(vipStatusClusterIdentifier); + vipStatus.setInRotation(true); } private void down() { stateMonitor.status(StateMonitor.Status.down); - vipStatus.removeFromRotation(vipStatusClusterIdentifier); + vipStatus.setInRotation(false); } private void initializing() { // This is default value (from config), so not strictly necessary stateMonitor.status(StateMonitor.Status.initializing); - vipStatus.removeFromRotation(vipStatusClusterIdentifier); + vipStatus.setInRotation(false); } private void startRpcServer() { |