From 2b843051a4e71d79fd8fb94014cc8a41a0f97560 Mon Sep 17 00:00:00 2001 From: Sachin Kale Date: Thu, 29 Aug 2024 13:09:18 +0530 Subject: [PATCH] Add minTranslogGeneration to remote translog metadata filename (#15489) Signed-off-by: Sachin Kale Co-authored-by: Sachin Kale --- .../index/translog/transfer/TranslogTransferMetadata.java | 1 + .../index/translog/transfer/TranslogTransferManagerTests.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferMetadata.java b/server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferMetadata.java index 052206d807fa6..acd7574e648a3 100644 --- a/server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferMetadata.java +++ b/server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferMetadata.java @@ -101,6 +101,7 @@ public String getFileName() { RemoteStoreUtils.invertLong(generation), RemoteStoreUtils.invertLong(createdAt), String.valueOf(Objects.hash(nodeId)), + RemoteStoreUtils.invertLong(minTranslogGeneration), String.valueOf(CURRENT_VERSION) ) ); diff --git a/server/src/test/java/org/opensearch/index/translog/transfer/TranslogTransferManagerTests.java b/server/src/test/java/org/opensearch/index/translog/transfer/TranslogTransferManagerTests.java index c6f9838ad2d52..ffa6a0f456f36 100644 --- a/server/src/test/java/org/opensearch/index/translog/transfer/TranslogTransferManagerTests.java +++ b/server/src/test/java/org/opensearch/index/translog/transfer/TranslogTransferManagerTests.java @@ -623,7 +623,7 @@ public void testMetadataConflict() throws InterruptedException { String mdFilename = tm.getFileName(); long count = mdFilename.chars().filter(ch -> ch == METADATA_SEPARATOR.charAt(0)).count(); // There should not be any `_` in mdFile name as it is used a separator . - assertEquals(10, count); + assertEquals(12, count); Thread.sleep(1); TranslogTransferMetadata tm2 = new TranslogTransferMetadata(1, 1, 1, 2, "node--2"); String mdFilename2 = tm2.getFileName();