Remove deprecated constructors in SegmentReplicationTargetService

Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
mch2 · Aug 30, 2024 · 650e029 · 650e029
1 parent 2224d48
commit 650e029
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 48 deletions.
diff --git a/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java b/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java
@@ -36,7 +36,6 @@
 import org.opensearch.indices.recovery.RecoverySettings;
 import org.opensearch.indices.recovery.RetryableTransportClient;
 import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
-import org.opensearch.indices.replication.common.ReplicationCollection;
 import org.opensearch.indices.replication.common.ReplicationCollection.ReplicationRef;
 import org.opensearch.indices.replication.common.ReplicationFailedException;
 import org.opensearch.indices.replication.common.ReplicationListener;
@@ -87,47 +86,6 @@ public static class Actions {
         public static final String FORCE_SYNC = "internal:index/shard/replication/segments_sync";
     }
 
-    @Deprecated
-    public SegmentReplicationTargetService(
-        final ThreadPool threadPool,
-        final RecoverySettings recoverySettings,
-        final TransportService transportService,
-        final SegmentReplicationSourceFactory sourceFactory,
-        final IndicesService indicesService,
-        final ClusterService clusterService
-    ) {
-        this(
-            threadPool,
-            recoverySettings,
-            transportService,
-            sourceFactory,
-            indicesService,
-            clusterService,
-            new ReplicationCollection<>(logger, threadPool)
-        );
-    }
-
-    @Deprecated
-    public SegmentReplicationTargetService(
-        final ThreadPool threadPool,
-        final RecoverySettings recoverySettings,
-        final TransportService transportService,
-        final SegmentReplicationSourceFactory sourceFactory,
-        final IndicesService indicesService,
-        final ClusterService clusterService,
-        final ReplicationCollection<SegmentReplicationTarget> ongoingSegmentReplications
-    ) {
-        this(
-            threadPool,
-            recoverySettings,
-            transportService,
-            sourceFactory,
-            indicesService,
-            clusterService,
-            new SegmentReplicator(threadPool)
-        );
-    }
-
     public SegmentReplicationTargetService(
         final ThreadPool threadPool,
         final RecoverySettings recoverySettings,

diff --git a/server/src/test/java/org/opensearch/index/shard/SegmentReplicationIndexShardTests.java b/server/src/test/java/org/opensearch/index/shard/SegmentReplicationIndexShardTests.java
@@ -60,6 +60,7 @@
 import org.opensearch.indices.replication.SegmentReplicationState;
 import org.opensearch.indices.replication.SegmentReplicationTarget;
 import org.opensearch.indices.replication.SegmentReplicationTargetService;
+import org.opensearch.indices.replication.SegmentReplicator;
 import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
 import org.opensearch.indices.replication.checkpoint.SegmentReplicationCheckpointPublisher;
 import org.opensearch.indices.replication.common.CopyState;
@@ -761,7 +762,8 @@ protected SegmentReplicationTargetService newTargetService(SegmentReplicationSou
             mock(TransportService.class),
             sourceFactory,
             null,
-            null
+            null,
+            new SegmentReplicator(threadPool)
         );
     }
 

diff --git a/...test/java/org/opensearch/index/shard/SegmentReplicationWithNodeToNodeIndexShardTests.java b/...test/java/org/opensearch/index/shard/SegmentReplicationWithNodeToNodeIndexShardTests.java
@@ -35,6 +35,7 @@
 import org.opensearch.indices.replication.SegmentReplicationSourceFactory;
 import org.opensearch.indices.replication.SegmentReplicationTarget;
 import org.opensearch.indices.replication.SegmentReplicationTargetService;
+import org.opensearch.indices.replication.SegmentReplicator;
 import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.TransportService;
@@ -399,7 +400,8 @@ public void testTemporaryFilesNotCleanup() throws Exception {
                 mock(TransportService.class),
                 sourceFactory,
                 indicesService,
-                clusterService
+                clusterService,
+                new SegmentReplicator(threadPool)
             );
             final Consumer<IndexShard> runnablePostGetFiles = (indexShard) -> {
                 try {

diff --git a/...rc/test/java/org/opensearch/indices/replication/SegmentReplicationTargetServiceTests.java b/...rc/test/java/org/opensearch/indices/replication/SegmentReplicationTargetServiceTests.java
@@ -565,7 +565,7 @@ public void testBeforeIndexShardClosed_DoesNothingForDocRepIndex() throws IOExce
             sourceFactory,
             indicesService,
             clusterService,
-            ongoingReplications
+            mock(SegmentReplicator.class)
         );
         final Settings settings = Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.DOCUMENT).build();
         IndexShard shard = newStartedShard(false, settings);
@@ -586,7 +586,7 @@ public void testShardRoutingChanged_DoesNothingForDocRepIndex() throws IOExcepti
             sourceFactory,
             indicesService,
             clusterService,
-            ongoingReplications
+            mock(SegmentReplicator.class)
         );
         final Settings settings = Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.DOCUMENT).build();
         IndexShard shard = newStartedShard(false, settings);

diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
@@ -207,6 +207,7 @@
 import org.opensearch.indices.replication.SegmentReplicationSourceFactory;
 import org.opensearch.indices.replication.SegmentReplicationSourceService;
 import org.opensearch.indices.replication.SegmentReplicationTargetService;
+import org.opensearch.indices.replication.SegmentReplicator;
 import org.opensearch.indices.replication.checkpoint.SegmentReplicationCheckpointPublisher;
 import org.opensearch.ingest.IngestService;
 import org.opensearch.monitor.StatusInfo;
@@ -2110,7 +2111,8 @@ public void onFailure(final Exception e) {
                         transportService,
                         new SegmentReplicationSourceFactory(transportService, recoverySettings, clusterService),
                         indicesService,
-                        clusterService
+                        clusterService,
+                        new SegmentReplicator(threadPool)
                     ),
                     mock(SegmentReplicationSourceService.class),
                     shardStateAction,

diff --git a/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java
@@ -138,6 +138,7 @@
 import org.opensearch.indices.replication.SegmentReplicationState;
 import org.opensearch.indices.replication.SegmentReplicationTarget;
 import org.opensearch.indices.replication.SegmentReplicationTargetService;
+import org.opensearch.indices.replication.SegmentReplicator;
 import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
 import org.opensearch.indices.replication.checkpoint.SegmentReplicationCheckpointPublisher;
 import org.opensearch.indices.replication.common.CopyState;
@@ -1494,7 +1495,8 @@ private SegmentReplicationTargetService getSegmentReplicationTargetService(
             transportService,
             sourceFactory,
             indicesService,
-            clusterService
+            clusterService,
+            new SegmentReplicator(threadPool)
         );
     }