Skip to content

Commit 9941eb6

Browse files
committed
Better test fix
1 parent 6bac16a commit 9941eb6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

server/src/test/java/org/elasticsearch/index/replication/RetentionLeasesReplicationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected void syncRetentionLeases(ShardId shardId, RetentionLeases leases, Acti
117117
}
118118
int numLeases = between(1, 100);
119119
IndexShard newPrimary = randomFrom(group.getReplicas());
120-
RetentionLeases latestRetentionLeasesOnNewPrimary = RetentionLeases.EMPTY;
120+
RetentionLeases latestRetentionLeasesOnNewPrimary = newPrimary.getRetentionLeases();
121121
for (int i = 0; i < numLeases; i++) {
122122
PlainActionFuture<ReplicationResponse> addLeaseFuture = new PlainActionFuture<>();
123123
group.addRetentionLease(Integer.toString(i), randomNonNegativeLong(), "test-" + i, addLeaseFuture);
@@ -136,7 +136,7 @@ protected void syncRetentionLeases(ShardId shardId, RetentionLeases leases, Acti
136136
group.addRetentionLease("new-lease-after-promotion", randomNonNegativeLong(), "test", newLeaseFuture);
137137
RetentionLeases leasesOnPrimary = group.getPrimary().getRetentionLeases();
138138
assertThat(leasesOnPrimary.primaryTerm(), equalTo(group.getPrimary().getOperationPrimaryTerm()));
139-
assertThat(leasesOnPrimary.version(), greaterThan(latestRetentionLeasesOnNewPrimary.version()));
139+
assertThat(leasesOnPrimary.version(), equalTo(latestRetentionLeasesOnNewPrimary.version() + 1));
140140
assertThat(leasesOnPrimary.leases(), hasSize(latestRetentionLeasesOnNewPrimary.leases().size() + 1));
141141
RetentionLeaseSyncAction.Request request = ((SyncRetentionLeasesResponse) newLeaseFuture.actionGet()).syncRequest;
142142
for (IndexShard replica : group.getReplicas()) {

0 commit comments

Comments
 (0)