Skip to content

Commit 2b84305

Browse files
sachinpkaleSachin Kale
and
Sachin Kale
authored
Add minTranslogGeneration to remote translog metadata filename (opensearch-project#15489)
Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com>
1 parent 3726c52 commit 2b84305

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferMetadata.java

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public String getFileName() {
101101
RemoteStoreUtils.invertLong(generation),
102102
RemoteStoreUtils.invertLong(createdAt),
103103
String.valueOf(Objects.hash(nodeId)),
104+
RemoteStoreUtils.invertLong(minTranslogGeneration),
104105
String.valueOf(CURRENT_VERSION)
105106
)
106107
);

server/src/test/java/org/opensearch/index/translog/transfer/TranslogTransferManagerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ public void testMetadataConflict() throws InterruptedException {
623623
String mdFilename = tm.getFileName();
624624
long count = mdFilename.chars().filter(ch -> ch == METADATA_SEPARATOR.charAt(0)).count();
625625
// There should not be any `_` in mdFile name as it is used a separator .
626-
assertEquals(10, count);
626+
assertEquals(12, count);
627627
Thread.sleep(1);
628628
TranslogTransferMetadata tm2 = new TranslogTransferMetadata(1, 1, 1, 2, "node--2");
629629
String mdFilename2 = tm2.getFileName();

0 commit comments

Comments
 (0)