From 57fa59182e34f996698ad9d6a5f6ba0fb59c133f Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Sun, 3 Feb 2019 13:51:13 -0500 Subject: [PATCH 1/2] Use current term in initial leases in engine test We need to use the current primary term instead of 1L for the initial retention leases; otherwise, the primary term of the committed retention-leases won't match the current primary term if the etention-leases never gets updated. --- .../org/elasticsearch/index/engine/InternalEngineTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 25b0c9e00cb7d..1e4ba195df9ec 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -5306,7 +5306,8 @@ public void testKeepMinRetainedSeqNoByMergePolicy() throws IOException { final AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED); final long primaryTerm = randomLongBetween(1, Long.MAX_VALUE); final AtomicLong retentionLeasesVersion = new AtomicLong(); - final AtomicReference retentionLeasesHolder = new AtomicReference<>(RetentionLeases.EMPTY); + final AtomicReference retentionLeasesHolder = new AtomicReference<>( + new RetentionLeases(primaryTerm, retentionLeasesVersion.get(), Collections.emptyList())); final List operations = generateSingleDocHistory(true, randomFrom(VersionType.INTERNAL, VersionType.EXTERNAL), 2, 10, 300, "2"); Randomness.shuffle(operations); From fb291291dc77a8a92c33de9188fa9bda1d9e280c Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 11 Feb 2019 10:22:45 -0500 Subject: [PATCH 2/2] Unmute it --- .../java/org/elasticsearch/index/engine/InternalEngineTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 14612a48fcdd5..9061d7dea8ab0 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -5296,7 +5296,6 @@ private void assertOperationHistoryInLucene(List operations) t } } - @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/pull/38285") public void testKeepMinRetainedSeqNoByMergePolicy() throws IOException { IOUtils.close(engine, store); Settings.Builder settings = Settings.builder()