Address PR comments

Signed-off-by: Sachin Kale <[email protected]>

server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java

@@ -164,7 +164,7 @@ public RemoteSegmentMetadata init() throws IOException {
      */
     public RemoteSegmentMetadata initializeToSpecificCommit(long primaryTerm, long commitGeneration, String acquirerId) throws IOException {
         String metadataFilePrefix = MetadataFilenameUtils.getMetadataFilePrefixForCommit(primaryTerm, commitGeneration);
-        String metadataFile = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLock(metadataFilePrefix, acquirerId);
+        String metadataFile = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLockedMetadataFile(metadataFilePrefix, acquirerId);
         RemoteSegmentMetadata remoteSegmentMetadata = readMetadataFile(metadataFile);
         if (remoteSegmentMetadata != null) {
             this.segmentsUploadedToRemoteStore = new ConcurrentHashMap<>(remoteSegmentMetadata.getMetadata());
@@ -751,7 +751,7 @@ public void deleteStaleSegments(int lastNMetadataFilesToKeep) throws IOException
         );
         Set<String> allLockFiles;
         try {
-            allLockFiles = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLocks(MetadataFilenameUtils.METADATA_PREFIX);
+            allLockFiles = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLockedMetadataFiles(MetadataFilenameUtils.METADATA_PREFIX);
         } catch (Exception e) {
             logger.error("Exception while fetching segment metadata lock files, skipping deleteStaleSegments", e);
             return;

server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java

@@ -76,7 +76,7 @@ public void release(LockInfo lockInfo) throws IOException {
         }
     }
 
-    public String fetchLock(String filenamePrefix, String acquirerId) throws IOException {
+    public String fetchLockedMetadataFile(String filenamePrefix, String acquirerId) throws IOException {
         Collection<String> lockFiles = lockDirectory.listFilesByPrefix(filenamePrefix);
         List<String> lockFilesForAcquirer = lockFiles.stream()
             .filter(lockFile -> acquirerId.equals(FileLockInfo.LockFileUtils.getAcquirerIdFromLock(lockFile)))
@@ -89,7 +89,7 @@ public String fetchLock(String filenamePrefix, String acquirerId) throws IOExcep
         return lockFilesForAcquirer.get(0);
     }
 
-    public Set<String> fetchLocks(String filenamePrefix) throws IOException {
+    public Set<String> fetchLockedMetadataFiles(String filenamePrefix) throws IOException {
         Collection<String> lockFiles = lockDirectory.listFilesByPrefix(filenamePrefix);
         return lockFiles.stream().map(FileLockInfo.LockFileUtils::getFileToLockNameFromLock).collect(Collectors.toSet());
     }

server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java

@@ -993,7 +993,7 @@ public void testDeleteStaleCommitsActualDeleteWithLocks() throws Exception {
         remoteSegmentStoreDirectory.init();
 
         // Locking one of the metadata files to ensure that it is not getting deleted.
-        when(mdLockManager.fetchLocks(any())).thenReturn(Set.of(metadataFilename2));
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenReturn(Set.of(metadataFilename2));
 
         // popluateMetadata() adds stub to return 3 metadata files
         // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted
@@ -1012,7 +1012,7 @@ public void testDeleteStaleCommitsNoDeletesDueToLocks() throws Exception {
         remoteSegmentStoreDirectory.init();
 
         // Locking all the old metadata files to ensure that none of the segment files are getting deleted.
-        when(mdLockManager.fetchLocks(any())).thenReturn(Set.of(metadataFilename2, metadataFilename3));
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenReturn(Set.of(metadataFilename2, metadataFilename3));
 
         // popluateMetadata() adds stub to return 3 metadata files
         // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted
@@ -1026,7 +1026,7 @@ public void testDeleteStaleCommitsExceptionWhileFetchingLocks() throws Exception
         remoteSegmentStoreDirectory.init();
 
         // Locking one of the metadata files to ensure that it is not getting deleted.
-        when(mdLockManager.fetchLocks(any())).thenThrow(new RuntimeException("Rate limit exceeded"));
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenThrow(new RuntimeException("Rate limit exceeded"));
 
         // popluateMetadata() adds stub to return 3 metadata files
         // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted

server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java

@@ -100,7 +100,7 @@ public void testIsAcquiredExceptionCase() { // metadata file is not passed durin
 
     public void testFetchLocksEmpty() throws IOException {
         when(lockDirectory.listFilesByPrefix("metadata")).thenReturn(Set.of());
-        assertEquals(0, remoteStoreMetadataLockManager.fetchLocks("metadata").size());
+        assertEquals(0, remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata").size());
     }
 
     public void testFetchLocksNonEmpty() throws IOException {
@@ -112,11 +112,11 @@ public void testFetchLocksNonEmpty() throws IOException {
                 FileLockInfo.LockFileUtils.generateLockName(metadata2, "snapshot2")
             )
         );
-        assertEquals(Set.of(metadata1, metadata2), remoteStoreMetadataLockManager.fetchLocks("metadata"));
+        assertEquals(Set.of(metadata1, metadata2), remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata"));
     }
 
     public void testFetchLocksException() throws IOException {
         when(lockDirectory.listFilesByPrefix("metadata")).thenThrow(new IOException("Something went wrong"));
-        assertThrows(IOException.class, () -> remoteStoreMetadataLockManager.fetchLocks("metadata"));
+        assertThrows(IOException.class, () -> remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata"));
     }
 }