summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-08-29 22:47:39 +0200
committerGitHub <noreply@github.com>2018-08-29 22:47:39 +0200
commit03efdabdc9f0e43fc2c362569ae455a7abc9a64b (patch)
treea66e3afacaf3d6ed7dc2046bb61aefbe51478376 /configserver
parentdbc86be22dad1d9fb279d978a45e621a5325ca7e (diff)
parent5703f2a5fe3af2cea95cc34faa74bd10fa918e2d (diff)
Merge pull request #6719 from vespa-engine/bratseth/initially-down
Be down initially
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java7
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() {