From ae291cca4d7633c615b167f6947340816326d20e Mon Sep 17 00:00:00 2001 From: Bansi Kasundra Date: Mon, 10 Jul 2023 23:04:27 -0700 Subject: [PATCH] Addressed PR comments Signed-off-by: Bansi Kasundra --- .../java/org/opensearch/snapshots/DeleteSnapshotIT.java | 2 ++ .../opensearch/repositories/blobstore/BlobStoreRepository.java | 1 - .../main/java/org/opensearch/snapshots/SnapshotsService.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/DeleteSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/DeleteSnapshotIT.java index ee05ad414a232..2688449294f3d 100644 --- a/server/src/internalClusterTest/java/org/opensearch/snapshots/DeleteSnapshotIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/DeleteSnapshotIT.java @@ -139,6 +139,7 @@ public void testDeleteMultipleShallowCopySnapshotsCase1() throws Exception { // Deleting multiple shallow copy snapshots as part of single delete call with both partial and full copy snapshot present in the repo // And then deleting multiple full copy snapshots as part of single delete call with both partial and shallow copy snapshots present in // the repo + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/8610") public void testDeleteMultipleShallowCopySnapshotsCase2() throws Exception { disableRepoConsistencyCheck("Remote store repository is being used in the test"); FeatureFlagSetter.set(FeatureFlags.REMOTE_STORE); @@ -227,6 +228,7 @@ public void testDeleteMultipleShallowCopySnapshotsCase2() throws Exception { } // Deleting subset of shallow and full copy snapshots as part of single delete call and then deleting all snapshots in the repo. + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/8610") public void testDeleteMultipleShallowCopySnapshotsCase3() throws Exception { disableRepoConsistencyCheck("Remote store repository is being used in the test"); FeatureFlagSetter.set(FeatureFlags.REMOTE_STORE); diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java index 74c5abceb6598..80c205205dea0 100644 --- a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java +++ b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java @@ -1538,7 +1538,6 @@ private void executeOneStaleIndexDelete( } catch (Exception e) { assert false : e; logger.warn(new ParameterizedMessage("[{}] Exception during single stale index delete", metadata.name()), e); - listener.onFailure(e); } executeOneStaleIndexDelete(staleIndicesToDelete, remoteStoreLockManagerFactory, listener); diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java index eb2a1aae991a6..3946e4363298c 100644 --- a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java +++ b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java @@ -2236,6 +2236,7 @@ private void deleteSnapshotsFromRepository( // when the repository currently have the flag disabled and we try to delete the shallow snapshots taken prior to disabling // the flag. This can be improved by having the info whether there ever were any shallow snapshot present in this repository // or not in RepositoryData. + // SEE https://github.com/opensearch-project/OpenSearch/issues/8610 final boolean cleanupRemoteStoreLockFiles = REMOTE_STORE_INDEX_SHALLOW_COPY.get(repository.getMetadata().settings()); if (cleanupRemoteStoreLockFiles) { repository.deleteSnapshotsAndReleaseLockFiles(