Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't wait joinThread when stopping #8359

Closed
wants to merge 2 commits into from
Closed

Don't wait joinThread when stopping #8359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c8d31f
Discovery: a more lenient wait joinThread when stopping
bleskes Nov 6, 2014
00955da
don't wait on joinThread at all. it's a thread pool thread.
bleskes Nov 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java
View file
Open in desktop
Expand Up @@ -253,6 +253,7 @@ public void onFailure(String source, @org.elasticsearch.common.Nullable Throwabl

@Override
protected void doStop() throws ElasticsearchException {
joinThreadControl.stop();
pingService.stop();
masterFD.stop("zen disco stop");
nodesFD.stop();
Expand Down Expand Up @@ -282,7 +283,6 @@ protected void doStop() throws ElasticsearchException {
}
}
}
joinThreadControl.stop();
}

@Override
Expand Down Expand Up @@ -1354,16 +1354,7 @@ public void stop() {
running.set(false);
Thread joinThread = currentJoinThread.getAndSet(null);
if (joinThread != null) {
try {
joinThread.interrupt();
} catch (Exception e) {
// ignore
}
try {
joinThread.join(10000);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
joinThread.interrupt();
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
View file
Open in desktop
Expand Up @@ -373,6 +373,9 @@ public void run() {
} catch (ConnectTransportException e) {
// can't connect to the node - this is a more common path!
logger.trace("[{}] failed to connect to {}", e, sendPingsHandler.id(), finalNodeToSend);
} catch (RemoteTransportException e) {
// something went wrong on the other side
logger.debug("[{}] received a remote error as a response to ping {}", e, sendPingsHandler.id(), finalNodeToSend);
} catch (Throwable e) {
logger.warn("[{}] failed send ping to {}", e, sendPingsHandler.id(), finalNodeToSend);
} finally {
Expand Down