From bfa2489cd032ce36e46f4ee4e01f52565188138c Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Fri, 1 Feb 2019 21:06:34 -0500 Subject: [PATCH 1/2] Fix primary term in testAddOrRenewRetentionLease We should increase primary term before renewing leases; otherwise, the term of the latest RetentionLeases will be lower than the current term. --- .../index/seqno/ReplicationTrackerRetentionLeaseTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java index 9781d893a1d53..4a86d0fdcf754 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java @@ -82,12 +82,12 @@ public void testAddOrRenewRetentionLease() { } for (int i = 0; i < length; i++) { - minimumRetainingSequenceNumbers[i] = randomLongBetween(minimumRetainingSequenceNumbers[i], Long.MAX_VALUE); - replicationTracker.renewRetentionLease(Integer.toString(i), minimumRetainingSequenceNumbers[i], "test-" + i); if (rarely() && primaryTerm < Long.MAX_VALUE) { primaryTerm = randomLongBetween(primaryTerm + 1, Long.MAX_VALUE); replicationTracker.setOperationPrimaryTerm(primaryTerm); } + minimumRetainingSequenceNumbers[i] = randomLongBetween(minimumRetainingSequenceNumbers[i], Long.MAX_VALUE); + replicationTracker.renewRetentionLease(Integer.toString(i), minimumRetainingSequenceNumbers[i], "test-" + i); assertRetentionLeases(replicationTracker, length, minimumRetainingSequenceNumbers, () -> 0L, primaryTerm, 1 + length + i, true); } } From d761c21a8848a851107678146e22c3855566bbee Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Fri, 1 Feb 2019 21:28:00 -0500 Subject: [PATCH 2/2] Revert "Mute testAddOrRenewRetentionLease (#38240)" This reverts commit 8bee5b8e0663f64b5fdaf274cd85d23e7bc83f9b. --- .../index/seqno/ReplicationTrackerRetentionLeaseTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java index e46873f2028a6..4a86d0fdcf754 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java @@ -50,7 +50,6 @@ public class ReplicationTrackerRetentionLeaseTests extends ReplicationTrackerTestCase { - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/38239") public void testAddOrRenewRetentionLease() { final AllocationId allocationId = AllocationId.newInitializing(); long primaryTerm = randomLongBetween(1, Long.MAX_VALUE);