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

Guard open connection call in RemoteClusterConnection (#44921) 

Fixes an issue where a call to openConnection was not properly guarded, allowing an exception
to bubble up to the uncaught exception handler, causing test failures.

Closes #44912
This commit is contained in:
Yannick Welsch 2019-07-26 22:27:13 +02:00
parent a041d1eacf
commit 1561ab5420
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java
View File

@ -419,14 +419,6 @@ final class RemoteClusterConnection implements TransportConnectionListener, Clos
} }
if (seedNodes.hasNext()) { if (seedNodes.hasNext()) {
final DiscoveryNode seedNode = maybeAddProxyAddress(proxyAddress, seedNodes.next().get());
logger.debug("[{}] opening connection to seed node: [{}] proxy address: [{}]", clusterAlias, seedNode,
proxyAddress);
final ConnectionProfile profile = ConnectionProfile.buildSingleChannelProfile(TransportRequestOptions.Type.REG);
final StepListener<Transport.Connection> openConnectionStep = new StepListener<>();
connectionManager.openConnection(seedNode, profile, openConnectionStep);
final Consumer<Exception> onFailure = e -> { final Consumer<Exception> onFailure = e -> {
if (e instanceof ConnectTransportException || if (e instanceof ConnectTransportException ||
e instanceof IOException || e instanceof IOException ||
@ -443,6 +435,17 @@ final class RemoteClusterConnection implements TransportConnectionListener, Clos
listener.onFailure(e); listener.onFailure(e);
}; };
final DiscoveryNode seedNode = maybeAddProxyAddress(proxyAddress, seedNodes.next().get());
logger.debug("[{}] opening connection to seed node: [{}] proxy address: [{}]", clusterAlias, seedNode,
proxyAddress);
final ConnectionProfile profile = ConnectionProfile.buildSingleChannelProfile(TransportRequestOptions.Type.REG);
final StepListener<Transport.Connection> openConnectionStep = new StepListener<>();
try {
connectionManager.openConnection(seedNode, profile, openConnectionStep);
} catch (Exception e) {
onFailure.accept(e);
}
final StepListener<TransportService.HandshakeResponse> handShakeStep = new StepListener<>(); final StepListener<TransportService.HandshakeResponse> handShakeStep = new StepListener<>();
openConnectionStep.whenComplete(connection -> { openConnectionStep.whenComplete(connection -> {
ConnectionProfile connectionProfile = connectionManager.getConnectionProfile(); ConnectionProfile connectionProfile = connectionManager.getConnectionProfile();