Iter TransportSearchAction

Author: cbuescher

server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

@@ -1904,12 +1904,15 @@ static List<SearchShardIterator> getLocalShardsIteratorFromPointInTime(
                     try {
                         final ShardIterator shards = OperationRouting.getShards(projectState.routingTable(), shardId);
                         // Prefer executing shard requests on nodes that are part of PIT first.
-                        if (projectState.cluster().nodes().nodeExists(perNode.getNode())) {
+                        boolean nodeExists = projectState.cluster().nodes().nodeExists(perNode.getNode());
+                        if (nodeExists) {
                             targetNodes.add(perNode.getNode());
                         }
-                        for (ShardRouting shard : shards) {
-                            if (shard.currentNodeId().equals(perNode.getNode()) == false) {
-                                targetNodes.add(shard.currentNodeId());
+                        if (perNode.getSearchContextId().getSearcherId() != null || nodeExists == false) {
+                            for (ShardRouting shard : shards) {
+                                if (shard.currentNodeId().equals(perNode.getNode()) == false) {
+                                    targetNodes.add(shard.currentNodeId());
+                                }
                             }
                         }
                     } catch (IndexNotFoundException | ShardNotFoundException e) {