Skip to content

Remove deprecated constructors in SegmentReplicationTargetService #15542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Remove deprecated constructors in SegmentReplicationTargetService #15542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
650e029
Remove deprecated constructors in SegmentReplicationTargetService
mch2 Aug 30, 2024
69d4226
Merge branch 'main' into polling
mch2 Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion server/src/test/java/org/opensearch/index/shard/SegmentReplicationIndexShardTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -761,7 +762,8 @@ protected SegmentReplicationTargetService newTargetService(SegmentReplicationSou
mock(TransportService.class),
sourceFactory,
null,
null
null,
new SegmentReplicator(threadPool)
);
}

Expand Down
4 changes: 3 additions & 1 deletion ...test/java/org/opensearch/index/shard/SegmentReplicationWithNodeToNodeIndexShardTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...rc/test/java/org/opensearch/indices/replication/SegmentReplicationTargetServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -2108,7 +2109,8 @@ public void onFailure(final Exception e) {
transportService,
new SegmentReplicationSourceFactory(transportService, recoverySettings, clusterService),
indicesService,
clusterService
clusterService,
new SegmentReplicator(threadPool)
),
mock(SegmentReplicationSourceService.class),
shardStateAction,
Expand Down
4 changes: 3 additions & 1 deletion test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1494,7 +1495,8 @@ private SegmentReplicationTargetService getSegmentReplicationTargetService(
transportService,
sourceFactory,
indicesService,
clusterService
clusterService,
new SegmentReplicator(threadPool)
);
}

Expand Down
Loading