Skip to content

Commit cca86ea

Browse files
authored
Fix primary term in testAddOrRenewRetentionLease (#38243)
We should increase primary term before renewing leases; otherwise, the term of the latest RetentionLeases will be lower than the current term. Backport of #38239
1 parent c23049a commit cca86ea

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050

5151
public class ReplicationTrackerRetentionLeaseTests extends ReplicationTrackerTestCase {
5252

53-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/38239")
5453
public void testAddOrRenewRetentionLease() {
5554
final AllocationId allocationId = AllocationId.newInitializing();
5655
long primaryTerm = randomLongBetween(1, Long.MAX_VALUE);
@@ -83,12 +82,12 @@ public void testAddOrRenewRetentionLease() {
8382
}
8483

8584
for (int i = 0; i < length; i++) {
86-
minimumRetainingSequenceNumbers[i] = randomLongBetween(minimumRetainingSequenceNumbers[i], Long.MAX_VALUE);
87-
replicationTracker.renewRetentionLease(Integer.toString(i), minimumRetainingSequenceNumbers[i], "test-" + i);
8885
if (rarely() && primaryTerm < Long.MAX_VALUE) {
8986
primaryTerm = randomLongBetween(primaryTerm + 1, Long.MAX_VALUE);
9087
replicationTracker.setOperationPrimaryTerm(primaryTerm);
9188
}
89+
minimumRetainingSequenceNumbers[i] = randomLongBetween(minimumRetainingSequenceNumbers[i], Long.MAX_VALUE);
90+
replicationTracker.renewRetentionLease(Integer.toString(i), minimumRetainingSequenceNumbers[i], "test-" + i);
9291
assertRetentionLeases(replicationTracker, length, minimumRetainingSequenceNumbers, () -> 0L, primaryTerm, 1 + length + i, true);
9392
}
9493
}

0 commit comments

Comments
 (0)