Skip to content

Commit c2a3eda

Browse files
authored
Fix testRecoverFromHardDeletesIndex (#50663)
We need to create a hard-deletes engine in the test with soft-deletes disabled; otherwise, we the min_retained_seqno will be calculated incorrectly. Closes #50654
1 parent 9a7ff38 commit c2a3eda

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5476,10 +5476,14 @@ public long softUpdateDocuments(Term term, Iterable<? extends Iterable<? extends
54765476
final AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED);
54775477
Path translogPath = createTempDir();
54785478
List<Engine.Operation> operations = generateHistoryOnReplica(between(1, 500), randomBoolean(), randomBoolean(), randomBoolean());
5479+
final IndexMetaData indexMetaData = IndexMetaData.builder(defaultSettings.getIndexMetaData())
5480+
.settings(Settings.builder().put(defaultSettings.getSettings()).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), false))
5481+
.build();
5482+
final IndexSettings indexSettings = IndexSettingsModule.newIndexSettings(indexMetaData);
54795483
try (Store store = createStore()) {
5480-
EngineConfig config = config(defaultSettings, store, translogPath, NoMergePolicy.INSTANCE, null, null, globalCheckpoint::get);
5484+
EngineConfig config = config(indexSettings, store, translogPath, NoMergePolicy.INSTANCE, null, null, globalCheckpoint::get);
54815485
final List<DocIdSeqNoAndSource> docs;
5482-
try (InternalEngine hardDeletesEngine = createEngine(defaultSettings, store, translogPath, newMergePolicy(),
5486+
try (InternalEngine hardDeletesEngine = createEngine(indexSettings, store, translogPath, newMergePolicy(),
54835487
hardDeletesWriter, null, globalCheckpoint::get)) {
54845488
for (Engine.Operation op : operations) {
54855489
applyOperation(hardDeletesEngine, op);

0 commit comments

Comments
 (0)