Skip to content

Commit 88c89f3

Browse files
authored
Fix SnapshotBasedIndexRecoveryIT#testSeqNoBasedRecoveryIsUsedAfterPrimaryFailOver (#80002)
Order RecoveryStates to ensure that we get the latest recovery state to assert that the peer recovery was successful. Closes #79455 Backport of #79469
1 parent 1ab16fc commit 88c89f3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/SnapshotBasedIndexRecoveryIT.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
import java.util.Arrays;
6969
import java.util.Collection;
7070
import java.util.Collections;
71+
import java.util.Comparator;
7172
import java.util.List;
7273
import java.util.Locale;
7374
import java.util.Map;
@@ -812,7 +813,6 @@ public void testRecoveryConcurrentlyWithIndexing() throws Exception {
812813
assertDocumentsAreEqual(indexName, numDocs.get());
813814
}
814815

815-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/79455")
816816
public void testSeqNoBasedRecoveryIsUsedAfterPrimaryFailOver() throws Exception {
817817
List<String> dataNodes = internalCluster().startDataOnlyNodes(3);
818818
String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
@@ -1373,8 +1373,10 @@ private RecoveryState getLatestPeerRecoveryStateForShard(String indexName, int s
13731373
assertThat(indexRecoveries, notNullValue());
13741374

13751375
List<RecoveryState> peerRecoveries = indexRecoveries.stream()
1376+
.filter(recoveryState -> recoveryState.getStage() == RecoveryState.Stage.DONE)
13761377
.filter(recoveryState -> recoveryState.getRecoverySource().equals(RecoverySource.PeerRecoverySource.INSTANCE))
13771378
.filter(recoveryState -> recoveryState.getShardId().getId() == shardId)
1379+
.sorted(Comparator.comparingLong(o -> o.getTimer().stopTime()))
13781380
.collect(Collectors.toList());
13791381

13801382
assertThat(peerRecoveries, is(not(empty())));

0 commit comments

Comments
 (0)