From 2433791fdc9d3ee79c67d18b1b285bd87e6d2bc7 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 30 Aug 2018 08:19:20 +0200 Subject: Revert "Be down initially" --- .../java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'configserver') 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() { -- cgit v1.2.3