Merge pull request #26598 from vespa-engine/hmusum/cleanup-orchestrator-6

Remove unused slobrok backoff policy

5 files changed, 3 insertions, 33 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
index c645c2005b0..2259b7b91b1 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.clustercontroller.core;
 
 import ai.vespa.validation.Validation;
-import com.yahoo.jrt.slobrok.api.BackOffPolicy;
 import com.yahoo.vdslib.distribution.ConfiguredNode;
 import com.yahoo.vdslib.distribution.Distribution;
 import com.yahoo.vdslib.state.NodeType;
@@ -107,9 +106,6 @@ public class FleetControllerOptions {
     /** Maximum time a node can be missing from slobrok before it is tagged down. */
     private final int maxSlobrokDisconnectGracePeriod;
 
-    /** Set by tests to retry often. */
-    private final BackOffPolicy slobrokBackOffPolicy;
-
     private final Distribution storageDistribution;
 
     // TODO: Get rid of this by always getting nodes by distribution.getNodes()
@@ -162,7 +158,6 @@ public class FleetControllerOptions {
                                    int minTimeBetweenNewSystemStates,
                                    boolean showLocalSystemStatesInEventLog,
                                    int maxSlobrokDisconnectGracePeriod,
-                                   BackOffPolicy slobrokBackOffPolicy,
                                    Distribution storageDistribution,
                                    Set<ConfiguredNode> nodes,
                                    Duration maxDeferredTaskVersionWaitTime,
@@ -204,7 +199,6 @@ public class FleetControllerOptions {
         this.minTimeBetweenNewSystemStates = minTimeBetweenNewSystemStates;
         this.showLocalSystemStatesInEventLog = showLocalSystemStatesInEventLog;
         this.maxSlobrokDisconnectGracePeriod = maxSlobrokDisconnectGracePeriod;
-        this.slobrokBackOffPolicy = slobrokBackOffPolicy;
         this.storageDistribution = storageDistribution;
         this.nodes = nodes;
         this.maxDeferredTaskVersionWaitTime = maxDeferredTaskVersionWaitTime;
@@ -349,10 +343,6 @@ public class FleetControllerOptions {
         return maxSlobrokDisconnectGracePeriod;
     }
 
-    public BackOffPolicy slobrokBackOffPolicy() {
-        return slobrokBackOffPolicy;
-    }
-
     public Distribution storageDistribution() {
         return storageDistribution;
     }
@@ -426,7 +416,6 @@ public class FleetControllerOptions {
         private int minTimeBetweenNewSystemStates = 0;
         private boolean showLocalSystemStatesInEventLog = true;
         private int maxSlobrokDisconnectGracePeriod = 1000;
-        private BackOffPolicy slobrokBackOffPolicy = null;
         private Distribution storageDistribution;
         private Set<ConfiguredNode> nodes;
         private Duration maxDeferredTaskVersionWaitTime = Duration.ofSeconds(30);
@@ -729,7 +718,6 @@ public class FleetControllerOptions {
                                               minTimeBetweenNewSystemStates,
                                               showLocalSystemStatesInEventLog,
                                               maxSlobrokDisconnectGracePeriod,
-                                              slobrokBackOffPolicy,
                                               storageDistribution,
                                               nodes,
                                               maxDeferredTaskVersionWaitTime,
@@ -775,7 +763,6 @@ public class FleetControllerOptions {
             builder.minTimeBetweenNewSystemStates = options.minTimeBetweenNewSystemStates;
             builder.showLocalSystemStatesInEventLog = options.showLocalSystemStatesInEventLog;
             builder.maxSlobrokDisconnectGracePeriod = options.maxSlobrokDisconnectGracePeriod;
-            builder.slobrokBackOffPolicy = options.slobrokBackOffPolicy;
             builder.storageDistribution = options.storageDistribution;
             builder.nodes = Set.copyOf(options.nodes);
             builder.maxDeferredTaskVersionWaitTime = options.maxDeferredTaskVersionWaitTime;
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
index 7d352373e2a..9358ae0d298 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
@@ -12,7 +12,6 @@ import com.yahoo.jrt.StringArray;
 import com.yahoo.jrt.StringValue;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Transport;
-import com.yahoo.jrt.slobrok.api.BackOffPolicy;
 import com.yahoo.jrt.slobrok.api.Register;
 import com.yahoo.jrt.slobrok.api.SlobrokList;
 import com.yahoo.net.HostName;
@@ -50,13 +49,11 @@ public class RpcServer {
     private Register register;
     private final List<Request> rpcRequests = new LinkedList<>();
     private MasterElectionHandler masterHandler;
-    private final BackOffPolicy slobrokBackOffPolicy;
 
-    public RpcServer(Object monitor, String clusterName, int fleetControllerIndex, BackOffPolicy bop) {
+    public RpcServer(Object monitor, String clusterName, int fleetControllerIndex) {
         this.monitor = monitor;
         this.clusterName = clusterName;
         this.fleetControllerIndex = fleetControllerIndex;
-        this.slobrokBackOffPolicy = bop;
     }
 
     public void setMasterElectionHandler(MasterElectionHandler handler) { this.masterHandler = handler; }
@@ -104,11 +101,7 @@ public class RpcServer {
         slist.setup(slobrokConnectionSpecs);
         Spec spec = new Spec(HostName.getLocalhost(), acceptor.port());
         log.log(Level.INFO, "Registering " + spec + " with slobrok at " + String.join(" ", slobrokConnectionSpecs));
-        if (slobrokBackOffPolicy != null) {
-            register = new Register(supervisor, slist, spec, slobrokBackOffPolicy);
-        } else {
-            register = new Register(supervisor, slist, spec);
-        }
+        register = new Register(supervisor, slist, spec);
         register.registerName(getSlobrokName());
     }
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
index 235b9671ef9..61aa7a79e24 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
@@ -233,7 +233,6 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa
         sb.append("<tr><td><nobr>Cycle wait time</nobr></td><td align=\"right\">").append(options.cycleWaitTime()).append(" ms</td></tr>");
         sb.append("<tr><td><nobr>Minimum time before first clusterstate broadcast as master</nobr></td><td align=\"right\">").append(RealTimer.printDuration(options.minTimeBeforeFirstSystemStateBroadcast())).append("</td></tr>");
         sb.append("<tr><td><nobr>Minimum time between official cluster states</nobr></td><td align=\"right\">").append(RealTimer.printDuration(options.minTimeBetweenNewSystemStates())).append("</td></tr>");
-        sb.append("<tr><td><nobr>Slobrok mirror backoff policy</nobr></td><td align=\"right\">").append(options.slobrokBackOffPolicy() == null ? "default" : "overridden").append("</td></tr>");
 
         sb.append("<tr><td><nobr>Node state request timeout</nobr></td><td align=\"right\">").append(RealTimer.printDuration(options.nodeStateRequestTimeoutMS())).append("</td></tr>");
         sb.append("<tr><td><nobr>Maximum distributor transition time</nobr></td><td align=\"right\">").append(RealTimer.printDuration(options.maxTransitionTime().get(NodeType.DISTRIBUTOR))).append("</td></tr>");
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index aa49074ed4a..f43c5354be5 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -125,7 +125,7 @@ public abstract class FleetControllerTest implements Waiter {
                 options.nodeStateRequestTimeoutLatestPercentage(),
                 options.nodeStateRequestRoundTripTimeMaxSeconds());
         var lookUp = new SlobrokClient(context, timer, new String[0]);
-        var rpcServer = new RpcServer(timer, options.clusterName(), options.fleetControllerIndex(), options.slobrokBackOffPolicy());
+        var rpcServer = new RpcServer(timer, options.clusterName(), options.fleetControllerIndex());
         var database = new DatabaseHandler(context, new ZooKeeperDatabaseFactory(context), timer, options.zooKeeperServerAddress(), timer);
 
         // Setting this <1000 ms causes ECONNREFUSED on socket trying to connect to ZK server, in ZooKeeper,
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
index 0819e9981ab..995ece46779 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
@@ -9,7 +9,6 @@ import com.yahoo.jrt.StringValue;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Target;
 import com.yahoo.jrt.Transport;
-import com.yahoo.jrt.slobrok.api.BackOffPolicy;
 import com.yahoo.vdslib.distribution.ConfiguredNode;
 import com.yahoo.vdslib.distribution.Distribution;
 import com.yahoo.vdslib.state.ClusterState;
@@ -566,12 +565,4 @@ public class RpcServerTest extends FleetControllerTest {
         return req;
     }
 
-    private static class BackOff implements BackOffPolicy {
-        private int counter = 0;
-        public void reset() { counter = 0; }
-        public double get() { ++counter; return 0.01; }
-        public boolean shouldWarn(double v) { return ((counter % 1000) == 10); }
-        public boolean shouldInform(double v) { return false; }
-    }
-
 }