Refactored code and simplified remote txlog check

Signed-off-by: Ashish Singh <ssashish@amazon.com>
opensearch-project · Aug 29, 2022 · efad86c · efad86c
1 parent 9d5ec82
commit efad86c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 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
@@ -3302,6 +3302,13 @@ private boolean isRemoteStoreEnabled() {
         return (remoteStore != null && shardRouting.primary());
     }
 
+    public boolean isRemoteTxlogEnabledOnPrimary() {
+        return indexSettings != null
+            && indexSettings.isSegRepEnabled()
+            && indexSettings.isRemoteStoreEnabled()
+            && indexSettings.isRemoteTranslogStoreEnabled();
+    }
+
     /**
      * Acquire a primary operation permit whenever the shard is ready for indexing. If a permit is directly available, the provided
      * ActionListener will be called on the calling thread. During relocation hand-off, permit acquisition can be delayed. The provided

diff --git a/server/src/main/java/org/opensearch/indices/recovery/PeerRecoveryTargetService.java b/server/src/main/java/org/opensearch/indices/recovery/PeerRecoveryTargetService.java
@@ -42,7 +42,6 @@
 import org.opensearch.OpenSearchTimeoutException;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionRunnable;
-import org.opensearch.action.support.replication.TransportWriteAction;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.ClusterStateObserver;
 import org.opensearch.cluster.metadata.IndexMetadata;
@@ -240,7 +239,7 @@ private void doRecovery(final long recoveryId, final StartRecoveryRequest preExi
                     logger.trace("{} preparing shard for peer recovery", recoveryTarget.shardId());
                     indexShard.prepareForIndexRecovery();
                     boolean isRecoveringReplicaWithRemoteTxLogEnabledIndex = recoveryTarget.state().getPrimary() == false
-                        && TransportWriteAction.IS_REMOTE_TXLOG_ENABLED.apply(indexShard);
+                        && indexShard.isRemoteTxlogEnabledOnPrimary();
                     final long startingSeqNo = isRecoveringReplicaWithRemoteTxLogEnabledIndex
                         ? indexShard.fetchStartSeqNoFromLastCommit()
                         : indexShard.recoverLocallyUpToGlobalCheckpoint();

diff --git a/server/src/main/java/org/opensearch/indices/recovery/RecoverySourceHandler.java b/server/src/main/java/org/opensearch/indices/recovery/RecoverySourceHandler.java
@@ -47,7 +47,6 @@
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.action.support.ThreadedActionListener;
 import org.opensearch.action.support.replication.ReplicationResponse;
-import org.opensearch.action.support.replication.TransportWriteAction;
 import org.opensearch.cluster.routing.IndexShardRoutingTable;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.common.CheckedRunnable;
@@ -318,7 +317,7 @@ && isTargetSameHistory()
             assert startingSeqNo >= 0 : "startingSeqNo must be non negative. got: " + startingSeqNo;
 
             boolean isRecoveringReplicaWithRemoteTxLogEnabledIndex = request.isPrimaryRelocation() == false
-                && TransportWriteAction.IS_REMOTE_TXLOG_ENABLED.apply(shard);
+                && shard.isRemoteTxlogEnabledOnPrimary();
 
             if (isRecoveringReplicaWithRemoteTxLogEnabledIndex) {
                 sendFileStep.whenComplete(r -> {