Skip to content

Commit ed4f208

Browse files
committed
Resolved merge conflicts
Signed-off-by: Bansi Kasundra <kasundra@amazon.com>
1 parent 5f658d2 commit ed4f208

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,10 @@ public void cloneRemoteStoreIndexShardSnapshot(
607607
// We don't need to check if there exists a shallow/full copy snapshot with the same name as we have the check before starting
608608
// the clone operation ensuring that the snapshot name is available by checking the repository data. Also, the new clone shallow
609609
// snapshot would have a different UUID and hence a new unique shallow-snap-N file will be created.
610-
RemoteStoreShardShallowCopySnapshot remStoreBasedShardMetadata = loadShallowCopyShardSnapshot(shardContainer, source);
610+
RemoteStoreShardShallowCopySnapshot remStoreBasedShardMetadata = (RemoteStoreShardShallowCopySnapshot) loadShardSnapshot(
611+
shardContainer,
612+
source
613+
);
611614
String indexUUID = remStoreBasedShardMetadata.getIndexUUID();
612615
String remoteStoreRepository = remStoreBasedShardMetadata.getRemoteStoreRepository();
613616
RemoteStoreMetadataLockManager remoteStoreMetadataLockManger = remoteStoreLockManagerFactory.newLockManager(

0 commit comments

Comments
 (0)