|
64 | 64 | import org.elasticsearch.index.mapper.SeqNoFieldMapper; |
65 | 65 | import org.elasticsearch.index.mapper.Uid; |
66 | 66 | import org.elasticsearch.index.seqno.ReplicationTracker; |
| 67 | +import org.elasticsearch.index.seqno.RetentionLease; |
67 | 68 | import org.elasticsearch.index.seqno.RetentionLeases; |
68 | 69 | import org.elasticsearch.index.seqno.SeqNoStats; |
69 | 70 | import org.elasticsearch.index.seqno.SequenceNumbers; |
@@ -628,7 +629,6 @@ public void writeFileChunk(StoreFileMetaData md, long position, BytesReference c |
628 | 629 | store.close(); |
629 | 630 | } |
630 | 631 |
|
631 | | - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/50424") |
632 | 632 | public void testCancelRecoveryDuringPhase1() throws Exception { |
633 | 633 | Store store = newStore(createTempDir("source"), false); |
634 | 634 | IndexShard shard = mock(IndexShard.class); |
@@ -677,8 +677,16 @@ public void cleanFiles(int totalTranslogOps, long globalCheckpoint, Store.Metada |
677 | 677 | } |
678 | 678 | } |
679 | 679 | }; |
| 680 | + final StartRecoveryRequest startRecoveryRequest = getStartRecoveryRequest(); |
680 | 681 | final RecoverySourceHandler handler = new RecoverySourceHandler( |
681 | | - shard, recoveryTarget, threadPool, getStartRecoveryRequest(), between(1, 16), between(1, 4)); |
| 682 | + shard, recoveryTarget, threadPool, startRecoveryRequest, between(1, 16), between(1, 4)) { |
| 683 | + @Override |
| 684 | + void createRetentionLease(long startingSeqNo, ActionListener<RetentionLease> listener) { |
| 685 | + final String leaseId = ReplicationTracker.getPeerRecoveryRetentionLeaseId(startRecoveryRequest.targetNode().getId()); |
| 686 | + listener.onResponse(new RetentionLease(leaseId, startingSeqNo, threadPool.absoluteTimeInMillis(), |
| 687 | + ReplicationTracker.PEER_RECOVERY_RETENTION_LEASE_SOURCE)); |
| 688 | + } |
| 689 | + }; |
682 | 690 | cancelRecovery.set(() -> handler.cancel("test")); |
683 | 691 | final StepListener<RecoverySourceHandler.SendFileResult> phase1Listener = new StepListener<>(); |
684 | 692 | try { |
|
0 commit comments