Actually

albertzaharovits · albertzaharovits · commit 7edb9e6ae128 · 2026-03-16T18:48:03.000+02:00
diff --git 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 void testDeletesAreBatched() throws Exception {
             dataNode
         );
 
+        // waits for snapshot deletions to batch up
+        final var deletesEnqueuedListener = ClusterServiceUtils.addTemporaryStateListener(cs -> {
+            final var entries = SnapshotDeletionsInProgress.get(cs).getEntries();
+            return entries.size() == 1 && entries.getFirst().snapshots().size() == numSnapshots;
+        });
+
         final Collection<ListenableFuture<AcknowledgedResponse>> deleteFutures = new ArrayList<>();
         while (snapshotNames.isEmpty() == false) {
             final Collection<String> toDelete = randomSubsetOf(snapshotNames);
@@ -230,12 +236,8 @@ public void testDeletesAreBatched() throws Exception {
         final long repoGenAfterInitialSnapshots = getRepositoryData(repoName).getGenId();
         assertThat(repoGenAfterInitialSnapshots, is(numSnapshots - 1L));
 
-        // wait for snapshot deletions to batch up, before unblocking the snapshot holding them up
-        safeAwait(
-            ClusterServiceUtils.addTemporaryStateListener(
-                cs -> SnapshotDeletionsInProgress.get(cs).getEntries().getFirst().snapshots().size() == numSnapshots
-            )
-        );
+        // wait for snapshot deletions to batch up before unblocking the snapshot holding them up
+        safeAwait(deletesEnqueuedListener);
         unblockNode(repoName, dataNode);
 
         final SnapshotInfo slowSnapshotInfo = assertSuccessful(createSlowFuture);
