Addressed comments

Signed-off-by: Ankit Kala <ankikala@amazon.com>
opensearch-project · Jun 26, 2023 · 8931b93 · 8931b93
1 parent f5ce3cd
commit 8931b93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java b/server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
@@ -179,9 +179,7 @@ private synchronized void syncSegments(boolean isRetry) {
             return;
         }
         ReplicationCheckpoint checkpoint = indexShard.getLatestReplicationCheckpoint();
-        if (indexShard.indexSettings().isSegRepWithRemoteEnabled()) {
-            indexShard.onCheckpointPublished(checkpoint);
-        }
+        indexShard.onCheckpointPublished(checkpoint);
         beforeSegmentsSync(isRetry);
         long refreshTimeMs = segmentTracker.getLocalRefreshTimeMs(), refreshClockTimeMs = segmentTracker.getLocalRefreshClockTimeMs();
         long refreshSeqNo = segmentTracker.getLocalRefreshSeqNo();

diff --git a/.../org/opensearch/indices/replication/checkpoint/SegmentReplicationCheckpointPublisher.java b/.../org/opensearch/indices/replication/checkpoint/SegmentReplicationCheckpointPublisher.java
@@ -34,9 +34,7 @@ public SegmentReplicationCheckpointPublisher(PublishAction publishAction) {
 
     public void publish(IndexShard indexShard, ReplicationCheckpoint checkpoint) {
         publishAction.publish(indexShard, checkpoint);
-        if (indexShard.indexSettings().isSegRepWithRemoteEnabled() == false) {
-            indexShard.onCheckpointPublished(checkpoint);
-        }
+        indexShard.onCheckpointPublished(checkpoint);
     }
 
     /**

diff --git a/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java b/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
@@ -56,12 +56,17 @@ public class RemoteStoreRefreshListenerTests extends IndexShardTestCase {
     public void setup(boolean primary, int numberOfDocs) throws IOException {
         indexShard = newStartedShard(
             primary,
-            Settings.builder().put(IndexMetadata.SETTING_REMOTE_STORE_ENABLED, true).build(),
+            Settings.builder()
+                .put(IndexMetadata.SETTING_REMOTE_STORE_ENABLED, true)
+                .put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT)
+                .build(),
             new InternalEngineFactory()
         );
 
-        indexDocs(1, numberOfDocs);
-        indexShard.refresh("test");
+        if (primary) {
+            indexDocs(1, numberOfDocs);
+            indexShard.refresh("test");
+        }
 
         clusterService = new ClusterService(
             Settings.EMPTY,