Skip to content

Fix race condition in SnapshotMetricsIT.testSnapshotAPMMetrics #132686

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 2 commits into from
Aug 12, 2025
Merged

Fix race condition in SnapshotMetricsIT.testSnapshotAPMMetrics #132686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa7a6fc
Fix race condition in SnapshotMetricsIT.testSnapshotAPMMetrics
JeremyDahlgren Aug 11, 2025
b4c9455
Merge branch 'main' into fix-SnapshotMetricsIT-testSnapshotAPMMetrics
JeremyDahlgren Aug 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
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 @@ -515,9 +515,6 @@ tests:
- class: org.elasticsearch.xpack.sql.action.SqlSearchPageTimeoutIT
method: testSearchContextIsCleanedUpAfterPageTimeoutForAggregationQueries
issue: https://github.com/elastic/elasticsearch/issues/132619
- class: org.elasticsearch.repositories.SnapshotMetricsIT
method: testSnapshotAPMMetrics
issue: https://github.com/elastic/elasticsearch/issues/132672
- class: org.elasticsearch.xpack.ml.integration.TextEmbeddingQueryIT
method: testHybridSearch
issue: https://github.com/elastic/elasticsearch/issues/132703
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,6 @@ protected void doRun() {
() -> snapshotListeners.addListener(new ActionListener<>() {
@Override
public void onResponse(List<ActionListener<SnapshotInfo>> actionListeners) {
SnapshotsServiceUtils.completeListenersIgnoringException(actionListeners, snapshotInfo);
final Map<String, Object> attributesWithState = Maps.copyMapWithAddedEntry(
SnapshotMetrics.createAttributesMap(snapshot.getProjectId(), repo.getMetadata()),
"state",
Expand All @@ -1241,6 +1240,7 @@ public void onResponse(List<ActionListener<SnapshotInfo>> actionListeners) {
snapshotMetrics.snapshotsCompletedCounter().incrementBy(1, attributesWithState);
snapshotMetrics.snapshotsDurationHistogram()
.record((snapshotInfo.endTime() - snapshotInfo.startTime()) / 1_000.0, attributesWithState);
SnapshotsServiceUtils.completeListenersIgnoringException(actionListeners, snapshotInfo);
logger.info("snapshot [{}] completed with state [{}]", snapshot, snapshotInfo.state());
}

Expand Down