diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2021-03-24 14:27:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-24 14:27:13 +0100 |
commit | d148a642e72ca847f68753f324b755390ea4786f (patch) | |
tree | e36f43a14a0f623111c7cd2a8864d918b814585a /clustercontroller-apps | |
parent | c41308feb18b76b6f34c13cf6d231008bc8ef25e (diff) |
Revert "Avoid safe mutations in master moratorium and increase first cluster state broadcast deadline [run-systemtest]"
Diffstat (limited to 'clustercontroller-apps')
-rw-r--r-- | clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterControllerClusterConfigurer.java | 17 |
1 files changed, 3 insertions, 14 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 9dbe5212f8c..c6a2ecc0c1c 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 @@ -79,8 +79,11 @@ public class ClusterControllerClusterConfigurer { options.minRatioOfDistributorNodesUp = config.min_distributor_up_ratio(); options.minRatioOfStorageNodesUp = config.min_storage_up_ratio(); options.cycleWaitTime = (int) (config.cycle_wait_time() * 1000); + options.minTimeBeforeFirstSystemStateBroadcast = (int) (config.min_time_before_first_system_state_broadcast() * 1000); + options.nodeStateRequestTimeoutMS = (int) (config.get_node_state_request_timeout() * 1000); options.showLocalSystemStatesInEventLog = config.show_local_systemstates_in_event_log(); options.minTimeBetweenNewSystemStates = config.min_time_between_new_systemstates(); + options.maxSlobrokDisconnectGracePeriod = (int) (config.max_slobrok_disconnect_grace_period() * 1000); options.distributionBits = config.ideal_distribution_bits(); options.minNodeRatioPerGroup = config.min_node_ratio_per_group(); options.setMaxDeferredTaskVersionWaitTime(Duration.ofMillis((int)(config.max_deferred_task_version_wait_time_sec() * 1000))); @@ -90,20 +93,6 @@ public class ClusterControllerClusterConfigurer { options.clusterFeedBlockEnabled = config.enable_cluster_feed_block(); options.clusterFeedBlockLimit = Map.copyOf(config.cluster_feed_block_limit()); options.clusterFeedBlockNoiseLevel = config.cluster_feed_block_noise_level(); - - // minTimeBeforeFirstSystemStateBroadcast is the minimum time the CC will wait for the storage - // nodes and distributors being down in Slobrok and/or getnodestate, before being allowed to - // broadcast a cluster state. We therefore force a longer timeout depending on related settings. - options.maxSlobrokDisconnectGracePeriod = (int) (config.max_slobrok_disconnect_grace_period() * 1000); - options.nodeStateRequestTimeoutMS = (int) (config.get_node_state_request_timeout() * 1000); - options.minTimeBeforeFirstSystemStateBroadcast = max( - options.maxSlobrokDisconnectGracePeriod, - options.nodeStateRequestTimeoutMS, - (int) (config.min_time_before_first_system_state_broadcast() * 1000)); - } - - private static int max(int a, int b, int c) { - return Math.max(a, Math.max(b, c)); } private static void configure(FleetControllerOptions options, SlobroksConfig config) { |