Fix tests

Signed-off-by: Sachin Kale <kalsac@amazon.com>
opensearch-project · Nov 29, 2022 · 47db802 · 47db802
1 parent 58a125f
commit 47db802
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java b/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
@@ -111,7 +111,7 @@ public void afterRefresh(boolean didRefresh) {
                                 .filter(file -> file.startsWith(IndexFileNames.SEGMENTS))
                                 .collect(Collectors.toList());
                             Optional<String> latestSegmentInfos = segmentInfosFiles.stream()
-                                .max(Comparator.comparingLong(IndexFileNames::parseGeneration));
+                                .max(Comparator.comparingLong(SegmentInfos::generationFromSegmentsFileName));
 
                             if (latestSegmentInfos.isPresent()) {
                                 Set<String> segmentFilesFromSnapshot = new HashSet<>(refreshedLocalFiles);
@@ -182,7 +182,7 @@ String uploadSegmentInfosSnapshot(String latestSegmentsNFilename, SegmentInfos s
         userData.put(SequenceNumbers.MAX_SEQ_NO, Long.toString(processedLocalCheckpoint));
         segmentInfosSnapshot.setUserData(userData, false);
 
-        long commitGeneration = IndexFileNames.parseGeneration(latestSegmentsNFilename);
+        long commitGeneration = SegmentInfos.generationFromSegmentsFileName(latestSegmentsNFilename);
         String segmentInfoSnapshotFilename = SEGMENT_INFO_SNAPSHOT_FILENAME_PREFIX + "__" + commitGeneration;
         try (IndexOutput indexOutput = storeDirectory.createOutput(segmentInfoSnapshotFilename, IOContext.DEFAULT)) {
             segmentInfosSnapshot.write(indexOutput);

diff --git a/server/src/main/java/org/opensearch/index/shard/StoreRecovery.java b/server/src/main/java/org/opensearch/index/shard/StoreRecovery.java
@@ -484,7 +484,7 @@ private void recoverFromRemoteStore(IndexShard indexShard) throws IndexShardReco
                     SegmentInfos infosSnapshot = SegmentInfos.readCommit(
                         store.directory(),
                         indexInput,
-                        Integer.parseInt(segmentInfosSnapshotFilename.split("__")[1])
+                        Long.parseLong(segmentInfosSnapshotFilename.split("__")[1])
                     );
                     long processedLocalCheckpoint = Long.parseLong(infosSnapshot.getUserData().get(LOCAL_CHECKPOINT_KEY));
                     store.commitSegmentInfos(infosSnapshot, processedLocalCheckpoint, processedLocalCheckpoint);

diff --git a/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java b/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
@@ -224,7 +224,7 @@ private void verifyUploadedSegments(RemoteSegmentStoreDirectory remoteSegmentSto
             assertTrue(
                 uploadedSegments.keySet()
                     .stream()
-                    .anyMatch(s -> s.startsWith(SEGMENT_INFO_SNAPSHOT_FILENAME_PREFIX + "__" + commitGeneration))
+                    .anyMatch(s -> s.startsWith(SEGMENT_INFO_SNAPSHOT_FILENAME_PREFIX + "__" + Long.parseLong(commitGeneration, Character.MAX_RADIX)))
             );
         }
     }