summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-08-30 08:19:20 +0200
committerGitHub <noreply@github.com>2018-08-30 08:19:20 +0200
commit2433791fdc9d3ee79c67d18b1b285bd87e6d2bc7 (patch)
tree511231f13151ee7f3b65dac3d9cbfe7cd41a14d7 /configserver
parent03efdabdc9f0e43fc2c362569ae455a7abc9a64b (diff)
Revert "Be down initially"
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java7
1 files changed, 4 insertions, 3 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 7ec93c0cf98..46be61964ce 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,6 +39,7 @@ 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}
@@ -139,18 +140,18 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
private void up() {
stateMonitor.status(StateMonitor.Status.up);
- vipStatus.setInRotation(true);
+ vipStatus.addToRotation(vipStatusClusterIdentifier);
}
private void down() {
stateMonitor.status(StateMonitor.Status.down);
- vipStatus.setInRotation(false);
+ vipStatus.removeFromRotation(vipStatusClusterIdentifier);
}
private void initializing() {
// This is default value (from config), so not strictly necessary
stateMonitor.status(StateMonitor.Status.initializing);
- vipStatus.setInRotation(false);
+ vipStatus.removeFromRotation(vipStatusClusterIdentifier);
}
private void startRpcServer() {