Skip to content

Commit b13f77c

Browse files
Remove index merge policy reclaim_deletes_weight setting. (#64114)
This commit removes the unused `index.merge.policy.reclaim_deletes_weight` setting.
1 parent cf7e6b3 commit b13f77c

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
9292
MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_EXPLICIT_SETTING,
9393
MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGED_SEGMENT_SETTING,
9494
MergePolicyConfig.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING,
95-
MergePolicyConfig.INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING,
9695
IndexSortConfig.INDEX_SORT_FIELD_SETTING,
9796
IndexSortConfig.INDEX_SORT_ORDER_SETTING,
9897
IndexSortConfig.INDEX_SORT_MISSING_SETTING,

server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ public final class MergePolicyConfig {
115115
public static final int DEFAULT_MAX_MERGE_AT_ONCE_EXPLICIT = 30;
116116
public static final ByteSizeValue DEFAULT_MAX_MERGED_SEGMENT = new ByteSizeValue(5, ByteSizeUnit.GB);
117117
public static final double DEFAULT_SEGMENTS_PER_TIER = 10.0d;
118-
public static final double DEFAULT_RECLAIM_DELETES_WEIGHT = 2.0d;
119118
public static final double DEFAULT_DELETES_PCT_ALLOWED = 33.0d;
120119
public static final Setting<Double> INDEX_COMPOUND_FORMAT_SETTING =
121120
new Setting<>("index.compound_format", Double.toString(TieredMergePolicy.DEFAULT_NO_CFS_RATIO),
@@ -139,9 +138,6 @@ public final class MergePolicyConfig {
139138
public static final Setting<Double> INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING =
140139
Setting.doubleSetting("index.merge.policy.segments_per_tier", DEFAULT_SEGMENTS_PER_TIER, 2.0d,
141140
Property.Dynamic, Property.IndexScope);
142-
public static final Setting<Double> INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING =
143-
Setting.doubleSetting("index.merge.policy.reclaim_deletes_weight", DEFAULT_RECLAIM_DELETES_WEIGHT, 0.0d,
144-
Property.Dynamic, Property.IndexScope, Property.Deprecated);
145141
public static final Setting<Double> INDEX_MERGE_POLICY_DELETES_PCT_ALLOWED_SETTING =
146142
Setting.doubleSetting("index.merge.policy.deletes_pct_allowed", DEFAULT_DELETES_PCT_ALLOWED, 20.0d, 50.0d,
147143
Property.Dynamic, Property.IndexScope);
@@ -158,7 +154,6 @@ public final class MergePolicyConfig {
158154
// won't they end up with many segments?
159155
ByteSizeValue maxMergedSegment = indexSettings.getValue(INDEX_MERGE_POLICY_MAX_MERGED_SEGMENT_SETTING);
160156
double segmentsPerTier = indexSettings.getValue(INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING);
161-
double reclaimDeletesWeight = indexSettings.getValue(INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING);
162157
double deletesPctAllowed = indexSettings.getValue(INDEX_MERGE_POLICY_DELETES_PCT_ALLOWED_SETTING);
163158
this.mergesEnabled = indexSettings.getSettings().getAsBoolean(INDEX_MERGE_ENABLED, true);
164159
if (mergesEnabled == false) {

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportResumeFollowAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ static String[] extractLeaderShardHistoryUUIDs(Map<String, String> ccrIndexMetad
432432
MergePolicyConfig.INDEX_MERGE_POLICY_FLOOR_SEGMENT_SETTING,
433433
MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_EXPLICIT_SETTING,
434434
MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGED_SEGMENT_SETTING,
435-
MergePolicyConfig.INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING,
436435
MergeSchedulerConfig.AUTO_THROTTLE_SETTING,
437436
MergeSchedulerConfig.MAX_MERGE_COUNT_SETTING,
438437
MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING,

0 commit comments

Comments
 (0)