Pass timeout value to Replicator instead of fetching from shard

Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
opensearch-project · Aug 30, 2024 · 696d45a · 696d45a
1 parent dfe17be
commit 696d45a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 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
@@ -522,7 +522,7 @@ public SegmentReplicationTarget startReplication(
 
     // pkg-private for integration tests
     void startReplication(final SegmentReplicationTarget target) {
-        replicator.startReplication(target);
+        replicator.startReplication(target, recoverySettings.activityTimeout());
     }
 
     /**

diff --git a/server/src/main/java/org/opensearch/indices/replication/SegmentReplicator.java b/server/src/main/java/org/opensearch/indices/replication/SegmentReplicator.java
@@ -13,6 +13,7 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.lucene.index.CorruptIndexException;
 import org.opensearch.OpenSearchCorruptionException;
+import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.AbstractRunnable;
 import org.opensearch.common.util.concurrent.ConcurrentCollections;
 import org.opensearch.core.action.ActionListener;
@@ -64,7 +65,7 @@ SegmentReplicationTarget startReplication(
         final SegmentReplicationTargetService.SegmentReplicationListener listener
     ) {
         final SegmentReplicationTarget target = new SegmentReplicationTarget(indexShard, checkpoint, source, listener);
-        startReplication(target);
+        startReplication(target, indexShard.getRecoverySettings().activityTimeout());
         return target;
     }
 
@@ -123,10 +124,10 @@ public void onFailure(Exception e) {
     }
 
     // pkg-private for integration tests
-    void startReplication(final SegmentReplicationTarget target) {
+    void startReplication(final SegmentReplicationTarget target, TimeValue timeout) {
         final long replicationId;
         try {
-            replicationId = onGoingReplications.startSafe(target, target.indexShard().getRecoverySettings().internalActionTimeout());
+            replicationId = onGoingReplications.startSafe(target, timeout);
         } catch (ReplicationFailedException e) {
             // replication already running for shard.
             target.fail(e, false);