Skip to content

Commit 11b4fc8

Browse files
committed
TEST: Disable randomized soft-deletes settings
Tracked at #33321
1 parent 8853691 commit 11b4fc8

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ protected Settings indexSettings() {
162162
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
163163
.put(IndexSettings.MAX_REFRESH_LISTENERS_PER_SHARD.getKey(),
164164
between(10, 10 * IndexSettings.MAX_REFRESH_LISTENERS_PER_SHARD.get(Settings.EMPTY)))
165-
.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean())
165+
//norelease - AwaitsFix: https://github.com/elastic/elasticsearch/issues/33321
166+
.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), false)
166167
.put(IndexSettings.INDEX_SOFT_DELETES_RETENTION_OPERATIONS_SETTING.getKey(),
167168
randomBoolean() ? IndexSettings.INDEX_SOFT_DELETES_RETENTION_OPERATIONS_SETTING.get(Settings.EMPTY) : between(0, 1000))
168169
.build();

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,8 @@ public Settings indexSettings() {
725725
}
726726
// always default delayed allocation to 0 to make sure we have tests are not delayed
727727
builder.put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), 0);
728-
builder.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean());
728+
//norelease - AwaitsFix: https://github.com/elastic/elasticsearch/issues/33321
729+
builder.put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), false);
729730
if (randomBoolean()) {
730731
builder.put(IndexSettings.INDEX_SOFT_DELETES_RETENTION_OPERATIONS_SETTING.getKey(), between(0, 1000));
731732
}

test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ protected void startNode(long seed) throws Exception {
9292
.preparePutTemplate("random-soft-deletes-template")
9393
.setPatterns(Collections.singletonList("*"))
9494
.setOrder(0)
95-
.setSettings(Settings.builder().put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), randomBoolean())
95+
//norelease - AwaitsFix: https://github.com/elastic/elasticsearch/issues/33321
96+
.setSettings(Settings.builder().put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), false)
9697
.put(IndexSettings.INDEX_SOFT_DELETES_RETENTION_OPERATIONS_SETTING.getKey(),
9798
randomBoolean() ? IndexSettings.INDEX_SOFT_DELETES_RETENTION_OPERATIONS_SETTING.get(Settings.EMPTY) : between(0, 1000))
9899
).get();

0 commit comments

Comments
 (0)