Enable remote store for all integ tests

Signed-off-by: Sachin Kale <kalsac@amazon.com>
soosinha · Aug 31, 2023 · 3b93358 · 3b93358
1 parent 228cf7b
commit 3b93358
Show file tree

Hide file tree

Showing 8 changed files with 535 additions and 430 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/ClusterState.java b/server/src/main/java/org/opensearch/cluster/ClusterState.java
@@ -61,6 +61,7 @@
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.discovery.Discovery;
+import org.opensearch.indices.replication.common.ReplicationType;
 
 import java.io.IOException;
 import java.util.Collections;

diff --git a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java
@@ -670,8 +670,8 @@ public void apply(Settings value, Settings current, Settings previous) {
 
                 // Remote cluster state settings
                 RemoteClusterStateService.REMOTE_CLUSTER_STATE_ENABLED_SETTING,
-                RemoteClusterStateService.REMOTE_CLUSTER_STATE_REPOSITORY_SETTING
-                RemoteStoreService.REMOTE_STORE_MIGRATION_SETTING
+                RemoteClusterStateService.REMOTE_CLUSTER_STATE_REPOSITORY_SETTING,
+                //RemoteStoreService.REMOTE_STORE_MIGRATION_SETTING,
                 RemoteStoreService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING
             )
         )

diff --git a/server/src/main/java/org/opensearch/index/engine/InternalEngine.java b/server/src/main/java/org/opensearch/index/engine/InternalEngine.java
@@ -2145,8 +2145,10 @@ protected SegmentInfos getLastCommittedSegmentInfos() {
 
     @Override
     protected SegmentInfos getLatestSegmentInfos() {
-        try (final GatedCloseable<SegmentInfos> snapshot = getSegmentInfosSnapshot()) {
-            return snapshot.get();
+        OpenSearchDirectoryReader reader = null;
+        try {
+            reader = internalReaderManager.acquire();
+            return ((StandardDirectoryReader) reader.getDelegate()).getSegmentInfos();
         } catch (IOException e) {
             throw new EngineException(shardId, e.getMessage(), e);
         } finally {