Skip to content

Commit 34ec403

Browse files
authored
Remove unused index.ttl.disable_purge setting (#29527)
This setting does nothing, and is deprecated in the 6.x series by #29526. This change removes it entirely in 7.0.
1 parent 8f91743 commit 34ec403

File tree

3 files changed

+0
-39
lines changed

3 files changed

+0
-39
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
@@ -58,7 +58,6 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
5858

5959
public static final Set<Setting<?>> BUILT_IN_INDEX_SETTINGS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
6060
MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY,
61-
IndexSettings.INDEX_TTL_DISABLE_PURGE_SETTING,
6261
MergeSchedulerConfig.AUTO_THROTTLE_SETTING,
6362
MergeSchedulerConfig.MAX_MERGE_COUNT_SETTING,
6463
MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING,

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ public final class IndexSettings {
7070
(value) -> Translog.Durability.valueOf(value.toUpperCase(Locale.ROOT)), Property.Dynamic, Property.IndexScope);
7171
public static final Setting<Boolean> INDEX_WARMER_ENABLED_SETTING =
7272
Setting.boolSetting("index.warmer.enabled", true, Property.Dynamic, Property.IndexScope);
73-
public static final Setting<Boolean> INDEX_TTL_DISABLE_PURGE_SETTING =
74-
Setting.boolSetting("index.ttl.disable_purge", false, Property.Dynamic, Property.IndexScope);
7573
public static final Setting<String> INDEX_CHECK_ON_STARTUP = new Setting<>("index.shard.check_on_startup", "false", (s) -> {
7674
switch(s) {
7775
case "false":
@@ -292,7 +290,6 @@ public final class IndexSettings {
292290
private volatile int maxTokenCount;
293291
private volatile int maxNgramDiff;
294292
private volatile int maxShingleDiff;
295-
private volatile boolean TTLPurgeDisabled;
296293
private volatile TimeValue searchIdleAfter;
297294
private volatile int maxAnalyzedOffset;
298295
private volatile int maxTermsCount;
@@ -403,7 +400,6 @@ public IndexSettings(final IndexMetaData indexMetaData, final Settings nodeSetti
403400
maxTokenCount = scopedSettings.get(MAX_TOKEN_COUNT_SETTING);
404401
maxNgramDiff = scopedSettings.get(MAX_NGRAM_DIFF_SETTING);
405402
maxShingleDiff = scopedSettings.get(MAX_SHINGLE_DIFF_SETTING);
406-
TTLPurgeDisabled = scopedSettings.get(INDEX_TTL_DISABLE_PURGE_SETTING);
407403
maxRefreshListeners = scopedSettings.get(MAX_REFRESH_LISTENERS_PER_SHARD);
408404
maxSlicesPerScroll = scopedSettings.get(MAX_SLICES_PER_SCROLL);
409405
maxAnalyzedOffset = scopedSettings.get(MAX_ANALYZED_OFFSET_SETTING);
@@ -426,7 +422,6 @@ public IndexSettings(final IndexMetaData indexMetaData, final Settings nodeSetti
426422
mergeSchedulerConfig::setMaxThreadAndMergeCount);
427423
scopedSettings.addSettingsUpdateConsumer(MergeSchedulerConfig.AUTO_THROTTLE_SETTING, mergeSchedulerConfig::setAutoThrottle);
428424
scopedSettings.addSettingsUpdateConsumer(INDEX_TRANSLOG_DURABILITY_SETTING, this::setTranslogDurability);
429-
scopedSettings.addSettingsUpdateConsumer(INDEX_TTL_DISABLE_PURGE_SETTING, this::setTTLPurgeDisabled);
430425
scopedSettings.addSettingsUpdateConsumer(MAX_RESULT_WINDOW_SETTING, this::setMaxResultWindow);
431426
scopedSettings.addSettingsUpdateConsumer(MAX_INNER_RESULT_WINDOW_SETTING, this::setMaxInnerResultWindow);
432427
scopedSettings.addSettingsUpdateConsumer(MAX_ADJACENCY_MATRIX_FILTERS_SETTING, this::setMaxAdjacencyMatrixFilters);
@@ -770,18 +765,6 @@ public MergePolicy getMergePolicy() {
770765
return mergePolicyConfig.getMergePolicy();
771766
}
772767

773-
/**
774-
* Returns <code>true</code> if the TTL purge is disabled for this index. Default is <code>false</code>
775-
*/
776-
public boolean isTTLPurgeDisabled() {
777-
return TTLPurgeDisabled;
778-
}
779-
780-
private void setTTLPurgeDisabled(boolean ttlPurgeDisabled) {
781-
this.TTLPurgeDisabled = ttlPurgeDisabled;
782-
}
783-
784-
785768
public <T> T getValue(Setting<T> setting) {
786769
return scopedSettings.get(setting);
787770
}

server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -405,27 +405,6 @@ public void testGCDeletesSetting() {
405405
assertEquals(-1, settings.getGcDeletesInMillis());
406406
}
407407

408-
public void testIsTTLPurgeDisabled() {
409-
IndexMetaData metaData = newIndexMeta("index", Settings.builder()
410-
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
411-
.put(IndexSettings.INDEX_TTL_DISABLE_PURGE_SETTING.getKey(), false)
412-
.build());
413-
IndexSettings settings = new IndexSettings(metaData, Settings.EMPTY);
414-
assertFalse(settings.isTTLPurgeDisabled());
415-
settings.updateIndexMetaData(newIndexMeta("index", Settings.builder().put(IndexSettings.INDEX_TTL_DISABLE_PURGE_SETTING.getKey(),
416-
"true").build()));
417-
assertTrue(settings.isTTLPurgeDisabled());
418-
419-
settings.updateIndexMetaData(newIndexMeta("index", Settings.EMPTY));
420-
assertFalse("reset to default", settings.isTTLPurgeDisabled());
421-
422-
metaData = newIndexMeta("index", Settings.builder()
423-
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
424-
.build());
425-
settings = new IndexSettings(metaData, Settings.EMPTY);
426-
assertFalse(settings.isTTLPurgeDisabled());
427-
}
428-
429408
public void testTranslogFlushSizeThreshold() {
430409
ByteSizeValue translogFlushThresholdSize = new ByteSizeValue(Math.abs(randomInt()));
431410
ByteSizeValue actualValue = ByteSizeValue.parseBytesSizeValue(translogFlushThresholdSize.getBytes() + "B",

0 commit comments

Comments
 (0)