Skip to content

[9.1] Fix a racing condition in shard snapshot status update (#130302) #130368

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
merged 1 commit into from
Jul 1, 2025
Merged

[9.1] Fix a racing condition in shard snapshot status update (#130302) #130368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,9 +512,6 @@ tests:
- class: org.elasticsearch.test.apmintegration.TracesApmIT
method: testApmIntegration
issue: https://github.com/elastic/elasticsearch/issues/129651
- class: org.elasticsearch.snapshots.SnapshotShutdownIT
method: testSnapshotShutdownProgressTracker
issue: https://github.com/elastic/elasticsearch/issues/129752
- class: org.elasticsearch.xpack.security.SecurityRolesMultiProjectIT
method: testUpdatingFileBasedRoleAffectsAllProjects
issue: https://github.com/elastic/elasticsearch/issues/129775
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ private void startNewShardSnapshots(String localNodeId, SnapshotsInProgress.Entr
entry.version(),
entry.startTime()
);
snapshotStatus.updateStatusDescription("shard snapshot enqueuing to start");
startShardSnapshotTaskRunner.enqueueTask(new ActionListener<>() {
@Override
public void onResponse(Releasable releasable) {
Expand All @@ -429,7 +430,6 @@ public void onFailure(Exception e) {
assert false : wrapperException; // impossible
}
});
snapshotStatus.updateStatusDescription("shard snapshot enqueued to start");
}

// apply some backpressure by reserving one SNAPSHOT thread for the startup work
Expand Down