fixing testShouldProcessCheckpoint() in SegmentReplicationTargetServi…

…ceTests Signed-off-by: Rishikesh1159 <[email protected]>
opensearch-project · Jun 22, 2022 · 8b22a66 · 8b22a66
1 parent f6686f1
commit 8b22a66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -162,7 +162,6 @@
 import org.opensearch.indices.recovery.RecoveryState;
 import org.opensearch.indices.recovery.RecoveryTarget;
 import org.opensearch.indices.replication.checkpoint.SegmentReplicationCheckpointPublisher;
-import org.opensearch.indices.replication.checkpoint.PublishCheckpointRequest;
 import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
 import org.opensearch.indices.replication.checkpoint.SegmentReplicationCheckpointPublisher;
 import org.opensearch.repositories.RepositoriesService;

diff --git a/...rc/test/java/org/opensearch/indices/replication/SegmentReplicationTargetServiceTests.java b/...rc/test/java/org/opensearch/indices/replication/SegmentReplicationTargetServiceTests.java
@@ -19,15 +19,13 @@
 import org.opensearch.index.shard.IndexShardTestCase;
 import org.opensearch.indices.recovery.RecoverySettings;
 import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
+import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
 import org.opensearch.transport.TransportService;
 
 import java.io.IOException;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class SegmentReplicationTargetServiceTests extends IndexShardTestCase {
 
@@ -125,6 +123,7 @@ public void testAlreadyOnNewCheckpoint() {
 
     public void testShardAlreadyReplicating() {
         SegmentReplicationTargetService spy = spy(sut);
+        // Create a separate target and start it so the shard is already replicating.
         final SegmentReplicationTarget target = new SegmentReplicationTarget(
             checkpoint,
             indexShard,
@@ -133,8 +132,11 @@ public void testShardAlreadyReplicating() {
         );
         final SegmentReplicationTarget spyTarget = Mockito.spy(target);
         spy.startReplication(spyTarget);
+
+        // a new checkpoint comes in for the same IndexShard.
         spy.onNewCheckpoint(checkpoint, indexShard);
         verify(spy, times(0)).startReplication(any(), any(), any());
+        spyTarget.markAsDone();
     }
 
     public void testNewCheckpointBehindCurrentCheckpoint() {
@@ -151,7 +153,7 @@ public void testShardNotStarted() throws IOException {
         closeShards(shard);
     }
 
-    public void testShouldProcessCheckpoint() throws IOException {
+    public void testNewCheckpoint_validationPassesAndReplicationFails() throws IOException {
         allowShardFailures();
         SegmentReplicationTargetService spy = spy(sut);
         IndexShard spyShard = spy(indexShard);
@@ -163,16 +165,16 @@ public void testShouldProcessCheckpoint() throws IOException {
             cp.getSeqNo(),
             cp.getSegmentInfosVersion() + 1
         );
-        spy.onNewCheckpoint(newCheckpoint, spyShard);
         ArgumentCaptor<SegmentReplicationTargetService.SegmentReplicationListener> captor = ArgumentCaptor.forClass(
             SegmentReplicationTargetService.SegmentReplicationListener.class
         );
+        doNothing().when(spy).startReplication(any(), any(), any());
+        spy.onNewCheckpoint(newCheckpoint, spyShard);
         verify(spy, times(1)).startReplication(any(), any(), captor.capture());
         SegmentReplicationTargetService.SegmentReplicationListener listener = captor.getValue();
-        listener.onFailure(new SegmentReplicationState(), new OpenSearchException("testing"), true);
+        listener.onFailure(new SegmentReplicationState(new ReplicationLuceneIndex()), new OpenSearchException("testing"), true);
         verify(spyShard).failShard(any(), any());
         closeShard(indexShard, false);
-
     }
 
     public void testBeforeIndexShardClosed_CancelsOngoingReplications() {
@@ -185,6 +187,6 @@ public void testBeforeIndexShardClosed_CancelsOngoingReplications() {
         final SegmentReplicationTarget spy = Mockito.spy(target);
         sut.startReplication(spy);
         sut.beforeIndexShardClosed(indexShard.shardId(), indexShard, Settings.EMPTY);
-        Mockito.verify(spy, times(1)).cancel(any());
+        verify(spy, times(1)).cancel(any());
     }
 }