honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No cluster name filtering when sniffing is not enabled, closes #637.

This commit is contained in:
kimchy 2011-01-20 17:28:45 +02:00
parent 9ff8006d37
commit 545d8f35df
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/elasticsearch/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java
View File

@ -163,12 +163,30 @@ public class TransportClientNodesService extends AbstractComponent {
if (!transportService.nodeConnected(node)) {
try {
transportService.connectToNode(node);
newNodes.add(node);
} catch (Exception e) {
logger.debug("Failed to connect to node " + node + ", removed from nodes list", e);
continue;
}
} else {
newNodes.add(node);
}
try {
NodesInfoResponse nodeInfo = transportService.submitRequest(node, TransportActions.Admin.Cluster.Node.INFO, Requests.nodesInfoRequest("_local"), new BaseTransportResponseHandler<NodesInfoResponse>() {
@Override public NodesInfoResponse newInstance() {
return new NodesInfoResponse();
}
@Override public void handleResponse(NodesInfoResponse response) {
}
@Override public void handleException(TransportException exp) {
}
}).txGet();
if (!clusterName.equals(nodeInfo.clusterName())) {
logger.warn("Node {} not part of the cluster {}, ignoring...", node, clusterName);
} else {
newNodes.add(node);
}
} catch (Exception e) {
logger.warn("failed to get node info for {}", e, node);
}
}
nodes = new ImmutableList.Builder<DiscoveryNode>().addAll(newNodes).build();