Skip to content

Commit 9cfc6ca

Browse files
authored
Deprecate unused index.ttl.disable_purge setting (#29526)
This setting does nothing. This change deprecates it, for the 6.x series, and #29527 removes it entirely for the 7.x series.
1 parent 9bd3d3f commit 9cfc6ca

File tree

2 files changed

+7
-33
lines changed

2 files changed

+7
-33
lines changed

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ public final class IndexSettings {
8080
(value) -> Translog.Durability.valueOf(value.toUpperCase(Locale.ROOT)), Property.Dynamic, Property.IndexScope);
8181
public static final Setting<Boolean> INDEX_WARMER_ENABLED_SETTING =
8282
Setting.boolSetting("index.warmer.enabled", true, Property.Dynamic, Property.IndexScope);
83+
@Deprecated
8384
public static final Setting<Boolean> INDEX_TTL_DISABLE_PURGE_SETTING =
84-
Setting.boolSetting("index.ttl.disable_purge", false, Property.Dynamic, Property.IndexScope);
85+
Setting.boolSetting("index.ttl.disable_purge", false, Property.Dynamic, Property.IndexScope, Property.Deprecated);
8586
public static final Setting<String> INDEX_CHECK_ON_STARTUP = new Setting<>("index.shard.check_on_startup", "false", (s) -> {
8687
switch(s) {
8788
case "false":
@@ -302,7 +303,6 @@ public final class IndexSettings {
302303
private volatile int maxScriptFields;
303304
private volatile int maxNgramDiff;
304305
private volatile int maxShingleDiff;
305-
private volatile boolean TTLPurgeDisabled;
306306
private volatile int maxAnalyzedOffset;
307307
private volatile int maxTermsCount;
308308

@@ -410,7 +410,6 @@ public IndexSettings(final IndexMetaData indexMetaData, final Settings nodeSetti
410410
maxScriptFields = scopedSettings.get(MAX_SCRIPT_FIELDS_SETTING);
411411
maxNgramDiff = scopedSettings.get(MAX_NGRAM_DIFF_SETTING);
412412
maxShingleDiff = scopedSettings.get(MAX_SHINGLE_DIFF_SETTING);
413-
TTLPurgeDisabled = scopedSettings.get(INDEX_TTL_DISABLE_PURGE_SETTING);
414413
maxRefreshListeners = scopedSettings.get(MAX_REFRESH_LISTENERS_PER_SHARD);
415414
maxSlicesPerScroll = scopedSettings.get(MAX_SLICES_PER_SCROLL);
416415
maxAnalyzedOffset = scopedSettings.get(MAX_ANALYZED_OFFSET_SETTING);
@@ -436,7 +435,6 @@ public IndexSettings(final IndexMetaData indexMetaData, final Settings nodeSetti
436435
mergeSchedulerConfig::setMaxThreadAndMergeCount);
437436
scopedSettings.addSettingsUpdateConsumer(MergeSchedulerConfig.AUTO_THROTTLE_SETTING, mergeSchedulerConfig::setAutoThrottle);
438437
scopedSettings.addSettingsUpdateConsumer(INDEX_TRANSLOG_DURABILITY_SETTING, this::setTranslogDurability);
439-
scopedSettings.addSettingsUpdateConsumer(INDEX_TTL_DISABLE_PURGE_SETTING, this::setTTLPurgeDisabled);
440438
scopedSettings.addSettingsUpdateConsumer(MAX_RESULT_WINDOW_SETTING, this::setMaxResultWindow);
441439
scopedSettings.addSettingsUpdateConsumer(MAX_INNER_RESULT_WINDOW_SETTING, this::setMaxInnerResultWindow);
442440
scopedSettings.addSettingsUpdateConsumer(MAX_ADJACENCY_MATRIX_FILTERS_SETTING, this::setMaxAdjacencyMatrixFilters);
@@ -774,18 +772,6 @@ public MergePolicy getMergePolicy() {
774772
return mergePolicyConfig.getMergePolicy();
775773
}
776774

777-
/**
778-
* Returns <code>true</code> if the TTL purge is disabled for this index. Default is <code>false</code>
779-
*/
780-
public boolean isTTLPurgeDisabled() {
781-
return TTLPurgeDisabled;
782-
}
783-
784-
private void setTTLPurgeDisabled(boolean ttlPurgeDisabled) {
785-
this.TTLPurgeDisabled = ttlPurgeDisabled;
786-
}
787-
788-
789775
public <T> T getValue(Setting<T> setting) {
790776
return scopedSettings.get(setting);
791777
}

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

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -386,24 +386,12 @@ public void testGCDeletesSetting() {
386386
}
387387

388388
public void testIsTTLPurgeDisabled() {
389-
IndexMetaData metaData = newIndexMeta("index", Settings.builder()
389+
final Settings settings = Settings.builder()
390390
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
391-
.put(IndexSettings.INDEX_TTL_DISABLE_PURGE_SETTING.getKey(), false)
392-
.build());
393-
IndexSettings settings = new IndexSettings(metaData, Settings.EMPTY);
394-
assertFalse(settings.isTTLPurgeDisabled());
395-
settings.updateIndexMetaData(newIndexMeta("index", Settings.builder().put(IndexSettings.INDEX_TTL_DISABLE_PURGE_SETTING.getKey(),
396-
"true").build()));
397-
assertTrue(settings.isTTLPurgeDisabled());
398-
399-
settings.updateIndexMetaData(newIndexMeta("index", Settings.EMPTY));
400-
assertFalse("reset to default", settings.isTTLPurgeDisabled());
401-
402-
metaData = newIndexMeta("index", Settings.builder()
403-
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
404-
.build());
405-
settings = new IndexSettings(metaData, Settings.EMPTY);
406-
assertFalse(settings.isTTLPurgeDisabled());
391+
.put(IndexSettings.INDEX_TTL_DISABLE_PURGE_SETTING.getKey(), true)
392+
.build();
393+
assertTrue(IndexSettings.INDEX_TTL_DISABLE_PURGE_SETTING.get(settings));
394+
assertSettingDeprecationsAndWarnings(new Setting<?>[]{IndexSettings.INDEX_TTL_DISABLE_PURGE_SETTING});
407395
}
408396

409397
public void testTranslogFlushSizeThreshold() {

0 commit comments

Comments
 (0)