diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/WriteLoadConstraintSettings.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/WriteLoadConstraintSettings.java index 3ee0702b13192..c6654c7fced19 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/WriteLoadConstraintSettings.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/WriteLoadConstraintSettings.java @@ -92,17 +92,7 @@ public boolean disabled() { */ public static final Setting WRITE_LOAD_DECIDER_QUEUE_LATENCY_THRESHOLD_SETTING = Setting.timeSetting( SETTING_PREFIX + "queue_latency_threshold", - TimeValue.timeValueSeconds(30), - Setting.Property.Dynamic, - Setting.Property.NodeScope - ); - - /** - * How often the data node calculates the write-loads for the individual shards - */ - public static final Setting WRITE_LOAD_DECIDER_SHARD_WRITE_LOAD_POLLING_INTERVAL_SETTING = Setting.timeSetting( - SETTING_PREFIX + "shard_write_load_polling_interval", - TimeValue.timeValueSeconds(60), + TimeValue.timeValueSeconds(10), Setting.Property.Dynamic, Setting.Property.NodeScope ); @@ -112,7 +102,7 @@ public boolean disabled() { */ public static final Setting WRITE_LOAD_DECIDER_REROUTE_INTERVAL_SETTING = Setting.timeSetting( SETTING_PREFIX + "reroute_interval", - TimeValue.timeValueSeconds(60), + TimeValue.ZERO, Setting.Property.Dynamic, Setting.Property.NodeScope ); diff --git a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java index b6353680651fd..94df2a1a87ba9 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java +++ b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java @@ -649,7 +649,6 @@ public void apply(Settings value, Settings current, Settings previous) { WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_HIGH_UTILIZATION_THRESHOLD_SETTING, WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_HIGH_UTILIZATION_DURATION_SETTING, WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_QUEUE_LATENCY_THRESHOLD_SETTING, - WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_SHARD_WRITE_LOAD_POLLING_INTERVAL_SETTING, WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_REROUTE_INTERVAL_SETTING ); }