Skip to content

Sets the new engine before closing the previous one in IndexShard.resetEngine #122255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlrx merged 6 commits into from
Feb 12, 2025
Merged

Sets the new engine before closing the previous one in IndexShard.resetEngine #122255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
247a9d3
Sets the new engine before closing the previous one in IndexShard.res…
tlrx Feb 11, 2025
af4cbd3
remove assert
tlrx Feb 11, 2025
4ac3697
adjust test
tlrx Feb 11, 2025
26592e2
[CI] Auto commit changes from spotless
Feb 11, 2025
3f42ffe
Merge branch 'main' into 2025/02/11/atomically-reset-engine
tlrx Feb 11, 2025
61cfece
Merge branch 'main' into 2025/02/11/atomically-reset-engine
tlrx Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4313,17 +4313,15 @@ public void resetEngine() {
assert waitForEngineOrClosedShardListeners.isDone();
try {
synchronized (engineMutex) {
final var currentEngine = getEngine();
currentEngine.prepareForEngineReset();
var engineConfig = newEngineConfig(replicationTracker);
verifyNotClosed();
IOUtils.close(currentEngine);
var newEngine = createEngine(engineConfig);
currentEngineReference.set(newEngine);
getEngine().prepareForEngineReset();
var newEngine = createEngine(newEngineConfig(replicationTracker));
IOUtils.close(currentEngineReference.getAndSet(newEngine));
onNewEngine(newEngine);
}
onSettingsChanged();
} catch (Exception e) {
// we want to fail the shard in the case prepareForEngineReset throws
failShard("unable to reset engine", e);
}
}
Expand Down
6 changes: 2 additions & 4 deletions server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4563,11 +4563,9 @@ public void testResetEngine() throws Exception {
var newEngineCreated = new CountDownLatch(2);
var indexShard = newStartedShard(true, Settings.EMPTY, config -> {
try {
return new ReadOnlyEngine(config, null, null, true, Function.identity(), true, true) {
return new ReadOnlyEngine(config, null, new TranslogStats(), false, Function.identity(), true, true) {
@Override
public void prepareForEngineReset() throws IOException {
;
}
public void prepareForEngineReset() throws IOException {}
};
} finally {
newEngineCreated.countDown();
Expand Down