diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java b/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java index dfe16aba6e..fb56e47233 100644 --- a/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java +++ b/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java @@ -225,10 +225,8 @@ private List searchInDataSourcesIndex(ClusterState state, Qu searchSourceBuilder.query(query); searchSourceBuilder.size(DATASOURCE_QUERY_RESULT_SIZE); searchRequest.source(searchSourceBuilder); - if (state.isSegmentReplicationEnabled(DATASOURCE_INDEX_NAME)) { - // https://github.com/opensearch-project/sql/issues/1801. - searchRequest.preference("_primary"); - } + // https://github.com/opensearch-project/sql/issues/1801. + searchRequest.preference("_primary_first"); ActionFuture searchResponseActionFuture; try (ThreadContext.StoredContext ignored = client.threadPool().getThreadContext().stashContext()) { diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java index 7c0b517e4b..7bca9d201c 100644 --- a/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java +++ b/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java @@ -104,39 +104,6 @@ public void testGetDataSourceMetadata() { "basicauth", dataSourceMetadata.getProperties().get("prometheus.auth.type")); } - @SneakyThrows - @Test - public void testGetDataSourceMetadataWithSegRepEnabled() { - Mockito.when(clusterService.state().routingTable().hasIndex(DATASOURCE_INDEX_NAME)) - .thenReturn(true); - Mockito.when(clusterService.state().isSegmentReplicationEnabled(DATASOURCE_INDEX_NAME)) - .thenReturn(true); - Mockito.when(client.search(ArgumentMatchers.any())).thenReturn(searchResponseActionFuture); - Mockito.when(searchResponseActionFuture.actionGet()).thenReturn(searchResponse); - Mockito.when(searchResponse.status()).thenReturn(RestStatus.OK); - Mockito.when(searchResponse.getHits()) - .thenReturn( - new SearchHits( - new SearchHit[] {searchHit}, new TotalHits(21, TotalHits.Relation.EQUAL_TO), 1.0F)); - Mockito.when(searchHit.getSourceAsString()).thenReturn(getBasicDataSourceMetadataString()); - Mockito.when(encryptor.decrypt("password")).thenReturn("password"); - Mockito.when(encryptor.decrypt("username")).thenReturn("username"); - - Optional dataSourceMetadataOptional = - openSearchDataSourceMetadataStorage.getDataSourceMetadata(TEST_DATASOURCE_INDEX_NAME); - - Assertions.assertFalse(dataSourceMetadataOptional.isEmpty()); - DataSourceMetadata dataSourceMetadata = dataSourceMetadataOptional.get(); - Assertions.assertEquals(TEST_DATASOURCE_INDEX_NAME, dataSourceMetadata.getName()); - Assertions.assertEquals(DataSourceType.PROMETHEUS, dataSourceMetadata.getConnector()); - Assertions.assertEquals( - "password", dataSourceMetadata.getProperties().get("prometheus.auth.password")); - Assertions.assertEquals( - "username", dataSourceMetadata.getProperties().get("prometheus.auth.username")); - Assertions.assertEquals( - "basicauth", dataSourceMetadata.getProperties().get("prometheus.auth.type")); - } - @SneakyThrows @Test public void testGetDataSourceMetadataWith404SearchResponse() {