[Test] Fix ConcurrentSnapshotsIT testDeletesAreBatched#144331
Merged
elasticsearchmachine merged 6 commits intoelastic:mainfrom Mar 17, 2026
Merged
[Test] Fix ConcurrentSnapshotsIT testDeletesAreBatched#144331elasticsearchmachine merged 6 commits intoelastic:mainfrom
elasticsearchmachine merged 6 commits intoelastic:mainfrom
Conversation
Collaborator
|
Pinging @elastic/es-distributed (Team:Distributed) |
DaveCTurner
reviewed
Mar 16, 2026
Member
DaveCTurner
left a comment
There was a problem hiding this comment.
++ this does look to be racy - suggested a simpler/faster fix
Comment on lines
+237
to
+238
| assertBusy(() -> { | ||
| SnapshotDeletionsInProgress snapshotDeletionsInProgress = SnapshotDeletionsInProgress.get( |
Member
There was a problem hiding this comment.
I think this would be sufficient and would avoid the busy-wait:
ClusterServiceUtils.addTemporaryStateListener(cs -> SnapshotDeletionsInProgress.get(cs).getEntries().getFirst().snapshots().size() == numSnapshots);
Member
There was a problem hiding this comment.
(I mean, safeAwait on the listener that addTemporaryStateListener returns)
Member
There was a problem hiding this comment.
Slightly subtle: you have to add the listener first, and handle the empty case too:
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
index d28b29e6d5e0..e1d9c0966189 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
@@ -213,6 +213,12 @@ public class ConcurrentSnapshotsIT extends AbstractSnapshotIntegTestCase {
dataNode
);
+ final var deletesEnqueuedListener = ClusterServiceUtils.addTemporaryStateListener(cs -> {
+ final var entries = SnapshotDeletionsInProgress.get(cs).getEntries();
+ assertThat(entries, anyOf(hasSize(0), hasSize(1)));
+ return entries.isEmpty() == false && entries.getFirst().snapshots().size() == numSnapshots;
+ });
+
final Collection<ListenableFuture<AcknowledgedResponse>> deleteFutures = new ArrayList<>();
while (snapshotNames.isEmpty() == false) {
final Collection<String> toDelete = randomSubsetOf(snapshotNames);
@@ -224,6 +230,7 @@ public class ConcurrentSnapshotsIT extends AbstractSnapshotIntegTestCase {
clusterAdmin().prepareDeleteSnapshot(TEST_REQUEST_TIMEOUT, repoName, toDelete.toArray(Strings.EMPTY_ARRAY)).execute(future);
deleteFutures.add(future);
}
+ safeAwait(deletesEnqueuedListener);
assertThat(createSlowFuture.isDone(), is(false));
Contributor
Author
There was a problem hiding this comment.
Thanks, yeah good point! TIL org.elasticsearch.test.ClusterServiceUtils#addTemporaryStateListener
Pushed 6875de8
michalborek
pushed a commit
to michalborek/elasticsearch
that referenced
this pull request
Mar 23, 2026
I think the test fails because some cluster state tasks that delete snapshots might actually be scheduled after the snapshot that holds up all deletions executes (i.e. after it is unblocked). This creates multiple (2) snapshot deletion batches. This fix is ensuring that snapshot deletions are all batched up before unblocking the snapshot that's holding them up. Fixes elastic#144034
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I think the test fails because some cluster state tasks that delete snapshots might actually be scheduled after the snapshot that holds up all deletions executes (i.e. after it is unblocked). This creates multiple (2) snapshot deletion batches.
This fix is ensuring that snapshot deletions are all batched up before unblocking the snapshot that's holding them up.
Fixes #144034