Remove initiallyInRotation=false option: Not used

4 files changed, 13 insertions, 11 deletions

diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index dc13bd1807d..f8233569e28 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -241,6 +241,7 @@
       "public void <init>()",
       "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)",
       "public void setInRotation(java.lang.Boolean)",
       "public void addToRotation(java.lang.String)",
diff --git a/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java b/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java
index 4f4d4635933..23d219df340 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java
@@ -26,9 +26,6 @@ public class ClustersStatus extends AbstractComponent {
     /** Are there any (in-service influencing) clusters in this container? */
     private boolean containerHasClusters;
 
-    /** If we have no clusters, what should we answer? */
-    private boolean receiveTrafficByDefault;
-
     private final Object mutex = new Object();
 
     /** The status of clusters, when known. Note that clusters may exist for which there is no knowledge yet. */
@@ -42,10 +39,9 @@ public class ClustersStatus extends AbstractComponent {
         }
     }
 
+    /** @deprecated this is ignored */
+    @Deprecated // TODO: remove on Vespa 8
     public void setReceiveTrafficByDefault(boolean receiveTrafficByDefault) {
-        synchronized (mutex) {
-            this.receiveTrafficByDefault = receiveTrafficByDefault;
-        }
     }
 
     void setUp(String clusterIdentifier) {
@@ -80,7 +76,7 @@ public class ClustersStatus extends AbstractComponent {
                 return clusterStatus.values().stream().anyMatch(status -> status==true);
             }
             else {
-                return receiveTrafficByDefault;
+                return true;
             }
         }
     }
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 3b71ffff616..a0a27ec942f 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,7 +24,7 @@ public class VipStatus {
     }
 
     public VipStatus(QrSearchersConfig dispatchers) {
-        this(dispatchers, new VipStatusConfig(new VipStatusConfig.Builder()), new ClustersStatus());
+        this(dispatchers, new ClustersStatus());
     }
 
     public VipStatus(ClustersStatus clustersStatus) {
@@ -32,12 +32,17 @@ public class VipStatus {
     }
 
     @Inject
-    public VipStatus(QrSearchersConfig dispatchers, VipStatusConfig vipStatusConfig, ClustersStatus clustersStatus) {
+    public VipStatus(QrSearchersConfig dispatchers, ClustersStatus clustersStatus) {
         this.clustersStatus = clustersStatus;
-        clustersStatus.setReceiveTrafficByDefault(vipStatusConfig.initiallyInRotation());
         clustersStatus.setContainerHasClusters(! dispatchers.searchcluster().isEmpty());
     }
 
+    /** @deprecated don't pass VipStatusConfig */
+    @Deprecated // TODO: Remove on Vespa 8
+    public VipStatus(QrSearchersConfig dispatchers, VipStatusConfig vipStatusConfig, ClustersStatus clustersStatus) {
+        this(dispatchers, clustersStatus);
+    }
+
     /**
      * Explicitly set this container in or out of rotation
      *
diff --git a/container-core/src/main/resources/configdefinitions/vip-status.def b/container-core/src/main/resources/configdefinitions/vip-status.def
index ed7ab3e4802..a042f5915c2 100644
--- a/container-core/src/main/resources/configdefinitions/vip-status.def
+++ b/container-core/src/main/resources/configdefinitions/vip-status.def
@@ -8,5 +8,5 @@ accessdisk bool default=false
 ## If the path is relative vespa home is prepended
 statusfile string default="share/qrsdocs/status.html"
 
-## The default rotation state when there are no configured clusters to decide rotation state
+## Not used TODO: Remove on Vespa 8
 initiallyInRotation bool default=true