Discovery: a more lenient wait joinThread when stopping

When a node stops, we cancel any ongoing join process. With #8327, we improved this logic and wait for it to complete before shutting down the node. In our tests we typically shutdown an entire cluster at once, which makes it very likely for nodes to be joining while shutting down. This introduces a race condition where the joinThread.interrupt can happen before the thread starts waiting on pings which causes shutdown logic to be slow. This commits improves by repeatedly trying to stop the thread in smaller waits.

Another side effect of the change is that we are now more likely to ping ourselves while shutting down, we results in an ugly warn level log. We now log all remote exception during pings at a debug level.

Closes #8359
This commit is contained in:
Boaz Leskes 2014-11-06 11:21:56 +01:00
parent c473976e31
commit 83d9dab798
2 changed files with 11 additions and 9 deletions

View File

@ -253,6 +253,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen
@Override @Override
protected void doStop() throws ElasticsearchException { protected void doStop() throws ElasticsearchException {
joinThreadControl.stop();
pingService.stop(); pingService.stop();
masterFD.stop("zen disco stop"); masterFD.stop("zen disco stop");
nodesFD.stop(); nodesFD.stop();
@ -282,7 +283,6 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen
} }
} }
} }
joinThreadControl.stop();
} }
@Override @Override
@ -1354,15 +1354,14 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen
running.set(false); running.set(false);
Thread joinThread = currentJoinThread.getAndSet(null); Thread joinThread = currentJoinThread.getAndSet(null);
if (joinThread != null) { if (joinThread != null) {
try { for (int i = 0; i < 10 && joinThread.isAlive(); i++) {
joinThread.interrupt(); joinThread.interrupt();
} catch (Exception e) {
// ignore
}
try { try {
joinThread.join(10000); joinThread.join(200);
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
return;
}
} }
} }
} }

View File

@ -373,6 +373,9 @@ public class UnicastZenPing extends AbstractLifecycleComponent<ZenPing> implemen
} catch (ConnectTransportException e) { } catch (ConnectTransportException e) {
// can't connect to the node - this is a more common path! // can't connect to the node - this is a more common path!
logger.trace("[{}] failed to connect to {}", e, sendPingsHandler.id(), finalNodeToSend); 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) { } catch (Throwable e) {
logger.warn("[{}] failed send ping to {}", e, sendPingsHandler.id(), finalNodeToSend); logger.warn("[{}] failed send ping to {}", e, sendPingsHandler.id(), finalNodeToSend);
} finally { } finally {