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

Avoid race when shutting down controller processes (#24579) 

This commit terminates any controller processes plugins might have after
the node has been closed.  This gives the plugins a chance to shut down their
controllers gracefully.

Previously there was a race condition where controller processes could be shut
down gracefully and terminated by two threads running in parallel, leading to
non-deterministic outcomes.

Additionally, controller processes that failed to shut down gracefully were
not forcibly terminated when running as a Windows service; there was a reliance
on the plugin to shut down its controller gracefully in this situation.
This commit also fixes this problem.
This commit is contained in:
David Roberts 2017-05-10 14:59:14 +01:00 committed by GitHub
parent 2486086980
commit d611ab4855
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -163,16 +163,6 @@ final class Bootstrap {
try { try {
spawner.spawnNativePluginControllers(environment); spawner.spawnNativePluginControllers(environment);
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
try {
spawner.close();
} catch (IOException e) {
throw new ElasticsearchException("Failed to destroy spawned controllers", e);
}
}
});
} catch (IOException e) { } catch (IOException e) {
throw new BootstrapException(e); throw new BootstrapException(e);
} }
@ -191,7 +181,7 @@ final class Bootstrap {
@Override @Override
public void run() { public void run() {
try { try {
IOUtils.close(node); IOUtils.close(node, spawner);
LoggerContext context = (LoggerContext) LogManager.getContext(false); LoggerContext context = (LoggerContext) LogManager.getContext(false);
Configurator.shutdown(context); Configurator.shutdown(context);
} catch (IOException ex) { } catch (IOException ex) {
@ -269,7 +259,7 @@ final class Bootstrap {
static void stop() throws IOException { static void stop() throws IOException {
try { try {
IOUtils.close(INSTANCE.node); IOUtils.close(INSTANCE.node, INSTANCE.spawner);
} finally { } finally {
INSTANCE.keepAliveLatch.countDown(); INSTANCE.keepAliveLatch.countDown();
} }