diff options
5 files changed, 1 insertions, 18 deletions
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java index 016345af8ce..e1d73436936 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java @@ -75,7 +75,6 @@ public class ClusterControllerClusterConfigurer extends AbstractComponent { builder.setMaxTransitionTime(NodeType.STORAGE, config.storage_transition_time()); builder.setMaxTransitionTime(NodeType.DISTRIBUTOR, config.distributor_transition_time()); builder.setMaxInitProgressTime(config.init_progress_time()); - builder.setStatePollingFrequency(config.state_polling_frequency()); builder.setMaxPrematureCrashes(config.max_premature_crashes()); builder.setStableStateTimePeriod(config.stable_state_time_period()); builder.setEventLogMaxSize(config.event_log_max_size()); diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java index f58dfe553bf..53dc71b2a90 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java @@ -496,7 +496,6 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta ((SlobrokClient) nodeLookup).setSlobrokConnectionSpecs(options.slobrokConnectionSpecs()); } eventLog.setMaxSize(options.eventLogMaxSize(), options.eventNodeLogMaxSize()); - cluster.setPollingFrequency(options.statePollingFrequency()); cluster.setDistribution(options.storageDistribution()); cluster.setNodes(options.nodes(), databaseContext.getNodeStateUpdateListener()); database.setZooKeeperAddress(options.zooKeeperServerAddress(), databaseContext); 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 6c543401502..7d2b540c97e 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 @@ -41,7 +41,6 @@ public class FleetControllerOptions { private final String zooKeeperServerAddress; - private final int statePollingFrequency; /** * Max amount of time to keep a node, that has previously been available * in steady state, in maintenance mode, while node is unreachable, before setting it down. @@ -142,7 +141,6 @@ public class FleetControllerOptions { int zooKeeperSessionTimeout, int masterZooKeeperCooldownPeriod, String zooKeeperServerAddress, - int statePollingFrequency, Map<NodeType, Integer> maxTransitionTime, int maxInitProgressTime, int maxPrematureCrashes, @@ -185,7 +183,6 @@ public class FleetControllerOptions { this.zooKeeperSessionTimeout = zooKeeperSessionTimeout; this.masterZooKeeperCooldownPeriod = masterZooKeeperCooldownPeriod; this.zooKeeperServerAddress = zooKeeperServerAddress; - this.statePollingFrequency = statePollingFrequency; this.maxTransitionTime = maxTransitionTime; this.maxInitProgressTime = maxInitProgressTime; this.maxPrematureCrashes = maxPrematureCrashes; @@ -271,10 +268,6 @@ public class FleetControllerOptions { return zooKeeperServerAddress; } - public int statePollingFrequency() { - return statePollingFrequency; - } - public Map<NodeType, Integer> maxTransitionTime() { return maxTransitionTime; } @@ -412,7 +405,6 @@ public class FleetControllerOptions { private int zooKeeperSessionTimeout = 5 * 60 * 1000; private int masterZooKeeperCooldownPeriod = 15 * 1000; private String zooKeeperServerAddress = null; - private int statePollingFrequency = 5000; private Map<NodeType, Integer> maxTransitionTime = new TreeMap<>(); private int maxInitProgressTime = 5000; private int maxPrematureCrashes = 4; @@ -527,11 +519,6 @@ public class FleetControllerOptions { return this; } - public Builder setStatePollingFrequency(int statePollingFrequency) { - this.statePollingFrequency = statePollingFrequency; - return this; - } - public Map<NodeType, Integer> maxTransitionTime() { return maxTransitionTime; } @@ -721,7 +708,6 @@ public class FleetControllerOptions { zooKeeperSessionTimeout, masterZooKeeperCooldownPeriod, zooKeeperServerAddress, - statePollingFrequency, maxTransitionTime, maxInitProgressTime, maxPrematureCrashes, @@ -768,7 +754,6 @@ public class FleetControllerOptions { builder.zooKeeperSessionTimeout = options.zooKeeperSessionTimeout; builder.masterZooKeeperCooldownPeriod = options.masterZooKeeperCooldownPeriod; builder.zooKeeperServerAddress = options.zooKeeperServerAddress; - builder.statePollingFrequency = options.statePollingFrequency; builder.maxTransitionTime = Map.copyOf(options.maxTransitionTime); builder.maxInitProgressTime = options.maxInitProgressTime; builder.maxPrematureCrashes = options.maxPrematureCrashes; 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 32b6cf47b87..74b92b3d94e 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 @@ -232,7 +232,6 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa 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>VDS 4.1 node state polling frequency</nobr></td><td align=\"right\">").append(RealTimer.printDuration(options.statePollingFrequency())).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>"); sb.append("<tr><td><nobr>Maximum storage transition time</nobr></td><td align=\"right\">").append(RealTimer.printDuration(options.maxTransitionTime().get(NodeType.STORAGE))).append("</td></tr>"); sb.append("<tr><td><nobr>Maximum initialize without progress time</nobr></td><td align=\"right\">").append(RealTimer.printDuration(options.maxInitProgressTime())).append("</td></tr>"); diff --git a/configdefinitions/src/vespa/fleetcontroller.def b/configdefinitions/src/vespa/fleetcontroller.def index bff33eaf034..af2d27df533 100644 --- a/configdefinitions/src/vespa/fleetcontroller.def +++ b/configdefinitions/src/vespa/fleetcontroller.def @@ -66,6 +66,7 @@ min_time_between_new_systemstates int default=10000 ## Sets how many milliseconds to wait between each state poll for old nodes ## requiring state polling. (4.1 or older) +## TODO: Not used, remove in Vespa 9 state_polling_frequency int default=5000 ## The maximum amount of premature crashes a node is allowed to have in a row |