Skip to content

Commit f333c05

Browse files
committed
Addressed PR comments
Signed-off-by: Bansi Kasundra <kasundra@amazon.com>
1 parent 613d119 commit f333c05

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

server/src/internalClusterTest/java/org/opensearch/snapshots/DeleteSnapshotIT.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.snapshots;
1010

11+
import org.junit.Ignore;
1112
import org.opensearch.action.ActionFuture;
1213
import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
1314
import org.opensearch.client.Client;
@@ -139,6 +140,7 @@ public void testDeleteMultipleShallowCopySnapshotsCase1() throws Exception {
139140
// Deleting multiple shallow copy snapshots as part of single delete call with both partial and full copy snapshot present in the repo
140141
// And then deleting multiple full copy snapshots as part of single delete call with both partial and shallow copy snapshots present in
141142
// the repo
143+
@Ignore("https://github.com/opensearch-project/OpenSearch/issues/8610")
142144
public void testDeleteMultipleShallowCopySnapshotsCase2() throws Exception {
143145
disableRepoConsistencyCheck("Remote store repository is being used in the test");
144146
FeatureFlagSetter.set(FeatureFlags.REMOTE_STORE);
@@ -227,6 +229,7 @@ public void testDeleteMultipleShallowCopySnapshotsCase2() throws Exception {
227229
}
228230

229231
// Deleting subset of shallow and full copy snapshots as part of single delete call and then deleting all snapshots in the repo.
232+
@Ignore("https://github.com/opensearch-project/OpenSearch/issues/8610")
230233
public void testDeleteMultipleShallowCopySnapshotsCase3() throws Exception {
231234
disableRepoConsistencyCheck("Remote store repository is being used in the test");
232235
FeatureFlagSetter.set(FeatureFlags.REMOTE_STORE);

server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,6 @@ private void executeOneStaleIndexDelete(
15381538
} catch (Exception e) {
15391539
assert false : e;
15401540
logger.warn(new ParameterizedMessage("[{}] Exception during single stale index delete", metadata.name()), e);
1541-
listener.onFailure(e);
15421541
}
15431542

15441543
executeOneStaleIndexDelete(staleIndicesToDelete, remoteStoreLockManagerFactory, listener);

server/src/main/java/org/opensearch/snapshots/SnapshotsService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2236,6 +2236,7 @@ private void deleteSnapshotsFromRepository(
22362236
// when the repository currently have the flag disabled and we try to delete the shallow snapshots taken prior to disabling
22372237
// the flag. This can be improved by having the info whether there ever were any shallow snapshot present in this repository
22382238
// or not in RepositoryData.
2239+
// SEE https://github.com/opensearch-project/OpenSearch/issues/8610
22392240
final boolean cleanupRemoteStoreLockFiles = REMOTE_STORE_INDEX_SHALLOW_COPY.get(repository.getMetadata().settings());
22402241
if (cleanupRemoteStoreLockFiles) {
22412242
repository.deleteSnapshotsAndReleaseLockFiles(

0 commit comments

Comments
 (0)