Merge pull request #12772 from vespa-engine/bratseth/configure-oor-for-config-servers

Configure initially out of rotation for config servers

6 files changed, 78 insertions, 27 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
index ee61b34987a..3d9a1b2e665 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
@@ -10,6 +10,7 @@ import com.yahoo.osgi.provider.model.ComponentModel;
  * @author Tony Vaagenes
  */
 public class FileStatusHandlerComponent extends Handler implements VipStatusConfig.Producer {
+
     public static final String CLASS = "com.yahoo.container.handler.VipStatusHandler";
 
     private final String fileName;
@@ -26,4 +27,5 @@ public class FileStatusHandlerComponent extends Handler implements VipStatusConf
         builder.accessdisk(true).
                 statusfile(fileName);
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 9b8d138a98a..470b82496a3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -9,6 +9,7 @@ import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.StatisticsConfig;
+import com.yahoo.container.core.VipStatusConfig;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
 import com.yahoo.net.HostName;
 import com.yahoo.vespa.defaults.Defaults;
@@ -29,7 +30,8 @@ public class ConfigserverCluster extends AbstractConfigProducer
         ZookeeperServerConfig.Producer,
         ConfigserverConfig.Producer,
         StatisticsConfig.Producer,
-        HealthMonitorConfig.Producer {
+        HealthMonitorConfig.Producer,
+        VipStatusConfig.Producer {
     private final CloudConfigOptions options;
     private ContainerCluster containerCluster;
 
@@ -178,4 +180,8 @@ public class ConfigserverCluster extends AbstractConfigProducer
         builder.snapshot_interval(60.0);
     }
 
+    @Override
+    public void getConfig(VipStatusConfig.Builder builder) {
+        builder.initiallyInRotation(false);
+    }
 }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
index 2a1254d0d8d..654d811a31f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java
@@ -12,6 +12,7 @@ import com.yahoo.config.provision.RegionName;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.QrSearchersConfig;
+import com.yahoo.container.core.VipStatusConfig;
 import com.yahoo.container.handler.ClustersStatus;
 import com.yahoo.container.handler.VipStatus;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
@@ -235,6 +236,7 @@ public class ConfigServerBootstrapTest {
 
     private VipStatus createVipStatus(StateMonitor stateMonitor) {
         return new VipStatus(new QrSearchersConfig.Builder().build(),
+                             new VipStatusConfig.Builder().build(),
                              new ClustersStatus(),
                              stateMonitor);
     }
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index ce567176679..6d683c53984 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -250,6 +250,7 @@
       "public void <init>(com.yahoo.container.QrSearchersConfig)",
       "public void <init>(com.yahoo.container.handler.ClustersStatus)",
       "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.handler.ClustersStatus)",
+      "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.core.VipStatusConfig, com.yahoo.container.handler.ClustersStatus, com.yahoo.container.jdisc.state.StateMonitor)",
       "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.handler.ClustersStatus, com.yahoo.container.jdisc.state.StateMonitor)",
       "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.core.VipStatusConfig, com.yahoo.container.handler.ClustersStatus)",
       "public void setInRotation(java.lang.Boolean)",
diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
index f712690efc5..0bf86e8f440 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
@@ -24,6 +24,8 @@ public class VipStatus {
     /** If this is non-null, its value decides whether this container is in rotation */
     private Boolean rotationOverride = null;
 
+    private final boolean initiallyInRotation;
+
     /** The current state of this */
     private boolean currentlyInRotation;
 
@@ -44,20 +46,29 @@ public class VipStatus {
         this(new QrSearchersConfig.Builder().build(), clustersStatus);
     }
 
+    /** For testing */
     public VipStatus(QrSearchersConfig dispatchers, ClustersStatus clustersStatus) {
-        this(dispatchers, clustersStatus, new StateMonitor());
+        this(dispatchers, new VipStatusConfig.Builder().build(), clustersStatus, new StateMonitor());
     }
 
     @Inject
-    public VipStatus(QrSearchersConfig dispatchers, ClustersStatus clustersStatus, StateMonitor healthState) {
+    public VipStatus(QrSearchersConfig dispatchers,
+                     VipStatusConfig vipStatusConfig,
+                     ClustersStatus clustersStatus,
+                     StateMonitor healthState) {
         this.clustersStatus = clustersStatus;
         this.healthState = healthState;
+        initiallyInRotation = vipStatusConfig.initiallyInRotation();
         healthState.status(StateMonitor.Status.initializing);
         clustersStatus.setContainerHasClusters(! dispatchers.searchcluster().isEmpty());
         updateCurrentlyInRotation();
     }
 
-    /** @deprecated don't pass VipStatusConfig */
+    @Deprecated // TODO: Remove on Vespa 8
+    public VipStatus(QrSearchersConfig dispatchers, ClustersStatus clustersStatus, StateMonitor healthState) {
+        this(dispatchers, new VipStatusConfig.Builder().build(), clustersStatus, healthState);
+    }
+
     @Deprecated // TODO: Remove on Vespa 8
     public VipStatus(QrSearchersConfig dispatchers, VipStatusConfig ignored, ClustersStatus clustersStatus) {
         this(dispatchers, clustersStatus);
@@ -107,7 +118,12 @@ public class VipStatus {
             } else {
                 if (healthState.status() == StateMonitor.Status.up) {
                     currentlyInRotation = clustersStatus.containerShouldReceiveTraffic(ClustersStatus.Require.ONE);
-                } else {
+                }
+                else if (healthState.status() == StateMonitor.Status.initializing) {
+                    currentlyInRotation = clustersStatus.containerShouldReceiveTraffic(ClustersStatus.Require.ALL)
+                                          && initiallyInRotation;
+                }
+                else {
                     currentlyInRotation = clustersStatus.containerShouldReceiveTraffic(ClustersStatus.Require.ALL);
                 }
             }
diff --git a/container-core/src/test/java/com/yahoo/container/handler/VipStatusTestCase.java b/container-core/src/test/java/com/yahoo/container/handler/VipStatusTestCase.java
index d3479936544..e13debcddda 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/VipStatusTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/VipStatusTestCase.java
@@ -4,6 +4,7 @@ package com.yahoo.container.handler;
 import static org.junit.Assert.*;
 
 import com.yahoo.container.QrSearchersConfig;
+import com.yahoo.container.core.VipStatusConfig;
 import com.yahoo.container.jdisc.state.StateMonitor;
 import com.yahoo.jdisc.core.SystemTimer;
 import org.junit.Test;
@@ -14,39 +15,45 @@ import org.junit.Test;
  * @author steinar
  */
 public class VipStatusTestCase {
-    private static final String [] clusters = {"cluster1", "cluster2", "cluster3"};
 
-    private static QrSearchersConfig getSearchersCfg() {
+    private static QrSearchersConfig getSearchersConfig(String[] clusters) {
         var b = new QrSearchersConfig.Builder();
-        var searchClusterB = new QrSearchersConfig.Searchcluster.Builder();
-        for (String cluster : clusters) {
-            searchClusterB.name(cluster);
+        if (clusters.length > 0) {
+            var searchClusterB = new QrSearchersConfig.Searchcluster.Builder();
+            for (String cluster : clusters) {
+                searchClusterB.name(cluster);
+            }
+            b.searchcluster(searchClusterB);
         }
-        b.searchcluster(searchClusterB);
         return b.build();
     }
-    private static VipStatus getVipStatus(StateMonitor.Status startState) {
-        return new VipStatus(getSearchersCfg(), new ClustersStatus(), new StateMonitor(1000, startState, new SystemTimer(), runnable -> {
-            Thread thread = new Thread(runnable, "StateMonitor");
-            thread.setDaemon(true);
-            return thread;
-        }));
+
+    private static VipStatus getVipStatus(String[] clusters, StateMonitor.Status startState, boolean initiallyInRotation) {
+        return new VipStatus(getSearchersConfig(clusters),
+                             new VipStatusConfig.Builder().initiallyInRotation(initiallyInRotation).build(),
+                             new ClustersStatus(),
+                             new StateMonitor(1000, startState, new SystemTimer(), runnable -> {
+                                 Thread thread = new Thread(runnable, "StateMonitor");
+                                 thread.setDaemon(true);
+                                 return thread;
+                             }));
     }
 
-    private static void removeAll(VipStatus v) {
+    private static void remove(String[] clusters, VipStatus v) {
         for (String s : clusters) {
             v.removeFromRotation(s);
         }
     }
-    private static void addAll(VipStatus v) {
+
+    private static void add(String[] clusters, VipStatus v) {
         for (String s : clusters) {
             v.addToRotation(s);
         }
     }
 
-    private static void verifyUpOrDown(StateMonitor.Status status) {
-        VipStatus v = getVipStatus(status);
-        removeAll(v);
+    private static void verifyUpOrDown(String[] clusters, StateMonitor.Status status) {
+        VipStatus v = getVipStatus(clusters, status, true);
+        remove(clusters, v);
         // initial state
         assertFalse(v.isInRotation());
         v.addToRotation(clusters[0]);
@@ -59,15 +66,18 @@ public class VipStatusTestCase {
 
     @Test
     public void testInitializingOrDownRequireAllUp() {
-        verifyUpOrDown(StateMonitor.Status.initializing);
-        verifyUpOrDown(StateMonitor.Status.down);
+        String[] clusters = {"cluster1", "cluster2", "cluster3"};
+        verifyUpOrDown(clusters, StateMonitor.Status.initializing);
+        verifyUpOrDown(clusters, StateMonitor.Status.down);
     }
 
     @Test
     public void testUpRequireAllDown() {
-        VipStatus v = getVipStatus(StateMonitor.Status.initializing);
+        String[] clusters = {"cluster1", "cluster2", "cluster3"};
+
+        VipStatus v = getVipStatus(clusters, StateMonitor.Status.initializing, true);
         assertFalse(v.isInRotation());
-        addAll(v);
+        add(clusters, v);
         assertTrue(v.isInRotation());
 
         v.removeFromRotation(clusters[0]);
@@ -89,4 +99,18 @@ public class VipStatusTestCase {
         assertTrue(v.isInRotation());
     }
 
-}
+    @Test
+    public void testNoClustersConfiguringInitiallyInRotationFalse() {
+        String[] clusters = {};
+        VipStatus v = getVipStatus(clusters, StateMonitor.Status.initializing, false);
+        assertFalse(v.isInRotation());
+    }
+
+    @Test
+    public void testNoClustersConfiguringInitiallyInRotationTrue() {
+        String[] clusters = {};
+        VipStatus v = getVipStatus(clusters, StateMonitor.Status.initializing, true);
+        assertTrue(v.isInRotation());
+    }
+
+}
\ No newline at end of file