Skip to content

Commit bbc09be

Browse files
committed
Incorporate PR review comments
Signed-off-by: Ashish Singh <ssashish@amazon.com>
1 parent eda5b2f commit bbc09be

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

server/src/main/java/org/opensearch/index/translog/InternalTranslogManager.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,10 +430,9 @@ public String getTranslogUUID() {
430430
* @return if the translog should be flushed
431431
*/
432432
public boolean shouldPeriodicallyFlush(long localCheckpointOfLastCommit, long flushThreshold) {
433-
long minRefSeqNo = translog instanceof RemoteFsTranslog
434-
? ((RemoteFsTranslog) translog).getMinSeqNoToKeep()
435-
: localCheckpointOfLastCommit + 1;
436-
final long minReferencedTranslogGeneration = translog.getMinGenerationForSeqNo(minRefSeqNo).translogFileGeneration;
433+
// This is the minimum seqNo that is referred in translog and considered for calculating translog size
434+
long minTranslogRefSeqNo = translog.getMinUnreferencedSeqNoInSegments(localCheckpointOfLastCommit + 1);
435+
final long minReferencedTranslogGeneration = translog.getMinGenerationForSeqNo(minTranslogRefSeqNo).translogFileGeneration;
437436
if (translog.sizeInBytesByMinGen(minReferencedTranslogGeneration) < flushThreshold) {
438437
return false;
439438
}

server/src/main/java/org/opensearch/index/translog/RemoteFsTranslog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,8 @@ public void onUploadFailed(TransferSnapshot transferSnapshot, Exception ex) thro
545545
}
546546
}
547547

548-
long getMinSeqNoToKeep() {
548+
@Override
549+
public long getMinUnreferencedSeqNoInSegments(long minUnrefCheckpointInLastCommit) {
549550
return minSeqNoToKeep;
550551
}
551552
}

server/src/main/java/org/opensearch/index/translog/Translog.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2034,4 +2034,8 @@ public static String createEmptyTranslog(
20342034
writer.close();
20352035
return uuid;
20362036
}
2037+
2038+
public long getMinUnreferencedSeqNoInSegments(long minUnrefCheckpointInLastCommit) {
2039+
return minUnrefCheckpointInLastCommit;
2040+
}
20372041
}

server/src/main/java/org/opensearch/indices/recovery/RemoteRecoveryTargetHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void prepareForTranslogOperations(int totalTranslogOps, ActionListener<Vo
134134
final ActionListener<TransportResponse.Empty> responseListener = ActionListener.map(listener, r -> null);
135135
if (remoteStoreEnabled) {
136136
// If remote store is enabled, during the prepare_translog phase, translog is also downloaded on the
137-
// target host along with incremental segments download. This
137+
// target host along with incremental segments download.
138138
retryableTransportClient.executeRetryableAction(action, request, translogOpsRequestOptions, responseListener, reader);
139139
} else {
140140
retryableTransportClient.executeRetryableAction(action, request, responseListener, reader);

0 commit comments

Comments
 (0)