Skip to content

Commit 6942041

Browse files
committed
Revert "Revert "Use read/write engine lock to guard operations against resets (#124635)" (#125915)"
This reverts commit 7fadeeb.
1 parent b563145 commit 6942041

File tree

3 files changed

+319
-72
lines changed

3 files changed

+319
-72
lines changed

server/src/main/java/org/elasticsearch/index/engine/Engine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2371,7 +2371,7 @@ public record FlushResult(boolean flushPerformed, long generation) {
23712371
}
23722372

23732373
/**
2374-
* Ensures the engine is in a state that it can be closed by a call to {@link IndexShard#resetEngine()}.
2374+
* Ensures the engine is in a state that it can be closed by a call to {@link IndexShard#resetEngine(Consumer<Engine>)}.
23752375
*
23762376
* In general, resetting the engine should be done with care, to consider any
23772377
* in-progress operations and listeners (e.g., primary term and generation listeners).

0 commit comments

Comments
 (0)