From 80d309229245929778d117a61c8db8a7c69da0f6 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Sat, 2 Feb 2019 02:38:53 -0500 Subject: [PATCH] Fix primary term in testAddOrRenewRetentionLease (#38239) We should increase primary term before renewing leases; otherwise, the term of the latest RetentionLeases will be lower than the current term. Relates #37951 --- .../index/seqno/ReplicationTrackerRetentionLeaseTests.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 da41e448530..5fa2df93db3 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 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; 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); @@ -83,12 +82,12 @@ public class ReplicationTrackerRetentionLeaseTests extends ReplicationTrackerTes } 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); } }