Skip to content

Commit f3c4ff5

Browse files
author
Kamal Nayan
committed
Refactored: Removed the unnecessary change
Signed-off-by: Kamal Nayan <askkamal@amazon.com>
1 parent 15c0b0c commit f3c4ff5

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

server/src/main/java/org/opensearch/index/shard/StoreRecovery.java

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -820,28 +820,14 @@ private void internalRecoverFromStoreForSearchReplica(IndexShard indexShard) thr
820820
}
821821

822822
private SegmentInfos readSegmentInfosFromStore(Store store) throws IndexShardRecoveryException {
823-
return readSegmentInfosFromStore(store, null);
824-
}
825-
826-
private SegmentInfos readSegmentInfosFromStore(Store store, IndexShard indexShard) throws IndexShardRecoveryException {
827823
SegmentInfos segmentInfos = null;
828824
try {
829825
store.failIfCorrupted();
830826
try {
831827
segmentInfos = store.readLastCommittedSegmentsInfo();
832-
} catch (Exception e) {
833-
String[] files = store.directory().listAll();
834-
if (files.length == 0) {
835-
logger.debug("Store is completely empty, returning null for empty store");
836-
return null;
837-
}
838-
// segmentN files might be missing due to remote store exclusion
839-
logger.debug("Failed to readLastCommittedSegmentsInfo from local store, attempting fallback to remote store metadata", e);
840-
segmentInfos = readSegmentInfosFromRemoteStore(store, indexShard);
841-
if (segmentInfos == null) {
842-
logger.debug("No segment info available from local or remote store, rethrowing original exception");
843-
throw e;
844-
}
828+
} catch (Exception ignored) {
829+
// Ignore the exception
830+
logger.error("Failed to readLastCommittedSegmentsInfo");
845831
}
846832
} catch (Exception e) {
847833
throw new IndexShardRecoveryException(shardId, "failed to fetch index version", e);
@@ -1014,7 +1000,7 @@ private void bootstrapForSnapshot(final IndexShard indexShard, final Store store
10141000
store.bootstrapNewHistory();
10151001
final SegmentInfos segmentInfos = store.readLastCommittedSegmentsInfo();
10161002
final long localCheckpoint = Long.parseLong(segmentInfos.userData.get(SequenceNumbers.LOCAL_CHECKPOINT_KEY));
1017-
String translogUUID = segmentInfos.getUserData().get(Translog.TRANSLOG_UUID_KEY);
1003+
String translogUUID = store.readLastCommittedSegmentsInfo().getUserData().get(Translog.TRANSLOG_UUID_KEY);
10181004
Translog.createEmptyTranslog(
10191005
indexShard.shardPath().resolveTranslog(),
10201006
shardId,

0 commit comments

Comments
 (0)