Do orphan timestamp cleanup before completing the snapshot (opensearc…

…h-project#16365) (opensearch-project#16385) (cherry picked from commit f1c98a4) Signed-off-by: Gaurav Bafna <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis · Oct 19, 2024 · 96fdbfd · 96fdbfd
1 parent 3ef3455
commit 96fdbfd
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
@@ -800,12 +800,12 @@ public void onResponse(RepositoryData repositoryData) {
                                 );
                                 return;
                             }
-                            listener.onResponse(snapshotInfo);
+                            cleanOrphanTimestamp(repositoryName, repositoryData);
                             logger.info("created snapshot-v2 [{}] in repository [{}]", repositoryName, snapshotName);
+                            listener.onResponse(snapshotInfo);
                             // For snapshot-v2, we don't allow concurrent snapshots . But meanwhile non-v2 snapshot operations
                             // can get queued . This is triggering them.
                             runNextQueuedOperation(repositoryData, repositoryName, true);
-                            cleanOrphanTimestamp(repositoryName, repositoryData);
                         }
 
                         @Override
@@ -840,14 +840,8 @@ private void cleanOrphanTimestamp(String repoName, RepositoryData repositoryData
         if (orphanPinnedEntities.isEmpty()) {
             return;
         }
-
         logger.info("Found {} orphan timestamps. Cleaning it up now", orphanPinnedEntities.size());
-        if (tryEnterRepoLoop(repoName)) {
-            deleteOrphanTimestamps(pinnedEntities, orphanPinnedEntities);
-            leaveRepoLoop(repoName);
-        } else {
-            logger.info("Concurrent snapshot create/delete is happening. Skipping clean up of orphan timestamps");
-        }
+        deleteOrphanTimestamps(pinnedEntities, orphanPinnedEntities);
     }
 
     private boolean isOrphanPinnedEntity(String repoName, Collection<String> snapshotUUIDs, String pinnedEntity) {