addressing comments

Signed-off-by: Bharathwaj G <[email protected]>
opensearch-project · May 17, 2022 · 471a64a · 471a64a
1 parent 11c5195
commit 471a64a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/action/search/CreatePitController.java b/server/src/main/java/org/opensearch/action/search/CreatePitController.java
@@ -229,7 +229,7 @@ private StepListener<BiFunction<String, String, DiscoveryNode>> getConnectionLoo
             .filter(ctx -> Strings.isEmpty(ctx.getClusterAlias()) == false)
             .map(SearchContextIdForNode::getClusterAlias)
             .collect(Collectors.toSet());
-        return SearchUtils.getConnectionLookupListener(searchTransportService, state, clusters);
+        return SearchUtils.getConnectionLookupListener(searchTransportService.getRemoteClusterService(), state, clusters);
     }
 
     private ActionListener<UpdatePitContextResponse> getGroupedListener(

diff --git a/server/src/main/java/org/opensearch/action/search/SearchUtils.java b/server/src/main/java/org/opensearch/action/search/SearchUtils.java
@@ -11,6 +11,7 @@
 import org.opensearch.action.StepListener;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNode;
+import org.opensearch.transport.RemoteClusterService;
 
 import java.util.Set;
 import java.util.function.BiFunction;
@@ -26,7 +27,7 @@ public SearchUtils() {}
      * Get connection lookup listener for list of clusters passed
      */
     public static StepListener<BiFunction<String, String, DiscoveryNode>> getConnectionLookupListener(
-        SearchTransportService searchTransportService,
+        RemoteClusterService remoteClusterService,
         ClusterState state,
         Set<String> clusters
     ) {
@@ -35,7 +36,7 @@ public static StepListener<BiFunction<String, String, DiscoveryNode>> getConnect
         if (clusters.isEmpty()) {
             lookupListener.onResponse((cluster, nodeId) -> state.getNodes().get(nodeId));
         } else {
-            searchTransportService.getRemoteClusterService().collectNodes(clusters, lookupListener);
+            remoteClusterService.collectNodes(clusters, lookupListener);
         }
         return lookupListener;
     }