Skip to content

Commit 66c507d

Browse files
committed
wording
1 parent 42033d1 commit 66c507d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

docs/reference/migration/migrate_8_0/indices.asciidoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ instead as it has the same effect as a synced flush in 7.6 and later.
4040
==== Indices with soft deletes disabled
4141

4242
Creating indices with soft deletes disabled was deprecated in 7.6 and
43-
is no longer supported in 8.0. Do not specify value for the setting
44-
`[index.soft_deletes.enabled]`.
43+
is no longer supported in 8.0. The setting index.soft_deletes.enabled
44+
can no longer be set to false. As the setting defaults to true, simply
45+
leave the setting unset.

server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ static Settings aggregateIndexSettings(ClusterState currentState, CreateIndexClu
437437
MetaDataCreateIndexService.checkShardLimit(indexSettings, currentState);
438438
if (IndexSettings.INDEX_SOFT_DELETES_SETTING.get(indexSettings) == false) {
439439
throw new IllegalArgumentException("Creating indices with soft-deletes disabled is no longer supported. " +
440-
"Please do not specify value for setting [index.soft_deletes.enabled].");
440+
"Please do not specify a value for setting [index.soft_deletes.enabled].");
441441
}
442442
return indexSettings;
443443
}

server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ public void testRejectWithSoftDeletesDisabled() {
834834
null, Settings.EMPTY, IndexScopedSettings.DEFAULT_SCOPED_SETTINGS);
835835
});
836836
assertThat(error.getMessage(), equalTo("Creating indices with soft-deletes disabled is no longer supported. "
837-
+ "Please do not specify value for setting [index.soft_deletes.enabled]."));
837+
+ "Please do not specify a value for setting [index.soft_deletes.enabled]."));
838838
}
839839

840840
private IndexTemplateMetaData addMatchingTemplate(Consumer<IndexTemplateMetaData.Builder> configurator) {

0 commit comments

Comments
 (0)