Address PR review comments

Signed-off-by: Ashish Singh <[email protected]>
opensearch-project · Nov 12, 2024 · fb50398 · fb50398
1 parent c172683
commit fb50398
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java
@@ -2565,28 +2565,27 @@ private void cleanupRedundantSnapshotShardPaths(Set<String> updatedShardPathsInd
             Set<String> updatedIndexIds = updatedShardPathsIndexIds.stream()
                 .map(s -> getIndexId(s.split("\\" + SnapshotShardPaths.DELIMITER)[0]))
                 .collect(Collectors.toSet());
+            logger.debug(new ParameterizedMessage("updatedIndexIds={}", updatedIndexIds));
             Set<String> indexIdShardPaths = getSnapshotShardPaths().keySet();
+            logger.debug(new ParameterizedMessage("indexIdShardPaths={}", indexIdShardPaths));
             List<String> staleShardPaths = indexIdShardPaths.stream()
                 .filter(s -> updatedShardPathsIndexIds.contains(s) == false)
                 .filter(s -> {
                     String indexId = getIndexId(s.split("\\" + SnapshotShardPaths.DELIMITER)[0]);
                     return updatedIndexIds.contains(indexId);
                 })
                 .collect(Collectors.toList());
-            try {
-                deleteFromContainer(snapshotShardPathBlobContainer(), staleShardPaths);
-            } catch (IOException e) {
-                logger.warn(
-                    new ParameterizedMessage(
-                        "Repository [{}] Exception during snapshot stale index deletion {}",
-                        metadata.name(),
-                        staleShardPaths
-                    ),
-                    e
-                );
-            }
-        } catch (Exception ex) {
-            logger.error("Exception during cleanup of redundant snapshot shard paths", ex);
+            logger.debug(new ParameterizedMessage("staleShardPaths={}", staleShardPaths));
+            deleteFromContainer(snapshotShardPathBlobContainer(), staleShardPaths);
+        } catch (Exception e) {
+            logger.warn(
+                new ParameterizedMessage(
+                    "Repository [{}] Exception during snapshot stale index deletion for updatedIndexIds {}",
+                    metadata.name(),
+                    updatedShardPathsIndexIds
+                ),
+                e
+            );
         }
     }
 

diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotShardPaths.java b/server/src/main/java/org/opensearch/snapshots/SnapshotShardPaths.java
@@ -92,7 +92,7 @@ public static SnapshotShardPaths fromXContent(XContentParser ignored) {
      * Parses a shard path string and extracts relevant shard information.
      *
      * @param shardPath The shard path string to parse. Expected format is:
-     *                  [index_id].[index_name].[shard_count].[path_type_code].[path_hash_algorithm_code]
+     *                  snapshot_path_[index_id].[index_name].[shard_count].[path_type_code].[path_hash_algorithm_code]
      * @return A {@link ShardInfo} object containing the parsed index ID and shard count.
      * @throws IllegalArgumentException if the shard path format is invalid or cannot be parsed.
      */
@@ -103,8 +103,12 @@ public static ShardInfo parseShardPath(String shardPath) {
             throw new IllegalArgumentException("Invalid shard path format: " + shardPath);
         }
         try {
-            // indexName is never used from within the ShardInfo returned
-            String indexName = len == 5 ? parts[1] : "";
+            String indexName = shardPath.substring(
+                // First separator after index id
+                shardPath.indexOf(DELIMITER) + 1,
+                // Since we know there are exactly 3 fields at the end
+                shardPath.lastIndexOf(DELIMITER, shardPath.lastIndexOf(DELIMITER, shardPath.lastIndexOf(DELIMITER) - 1) - 1)
+            );
             IndexId indexId = new IndexId(indexName, getIndexId(parts[0]), Integer.parseInt(parts[len - 2]));
             int shardCount = Integer.parseInt(parts[len - 3]);
             return new ShardInfo(indexId, shardCount);