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

adapt node connection to upstream changes

This commit is contained in:
javanna 2016-12-02 00:49:04 +01:00 committed by Luca Cavanna
parent 52b35bf0f8
commit 6102938989
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java
View File

@ -191,12 +191,12 @@ public class SearchTransportService extends AbstractComponent {
DiscoveryNode remoteNode = nodes.get(Randomness.get().nextInt(nodes.size())); DiscoveryNode remoteNode = nodes.get(Randomness.get().nextInt(nodes.size()));
//TODO we just take a random host for now, implement fallback in case of connect failure //TODO we just take a random host for now, implement fallback in case of connect failure
try { try {
DiscoveryNode discoveryNode = transportService.connectToNodeLightAndHandshake(remoteNode, 10000, false); //TODO at the moment the configured cluster names are really just labels. We should validate that all the nodes
//belong to the same cluster, also validate the cluster name against the configured label and make sure they match
DiscoveryNode discoveryNode = transportService.connectToNodeAndHandshake(remoteNode, 10000, false);
transportService.disconnectFromNode(remoteNode); // disconnect the light connection transportService.disconnectFromNode(remoteNode); // disconnect the light connection
// now go and do a real connection with the updated version of the node // now go and do a real connection with the updated version of the node
connectToRemoteNode(discoveryNode); connectToRemoteNode(discoveryNode);
//TODO at the moment the configured cluster names are really just labels. We should validate that all the nodes
//belong to the same cluster, also validate the cluster name against the configured label and make sure they match
return discoveryNode; return discoveryNode;
} catch(ConnectTransportException e) { } catch(ConnectTransportException e) {
throw new ConnectTransportException(remoteNode, "unable to connect to remote cluster [" + clusterName + "]", e); throw new ConnectTransportException(remoteNode, "unable to connect to remote cluster [" + clusterName + "]", e);