Repository: drill Updated Branches: refs/heads/master b0c4e0486 -> e4938c094
DRILL-5890: Fixed a file descriptor leak in Drill's test-suite This closes #1008 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e4938c09 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e4938c09 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e4938c09 Branch: refs/heads/master Commit: e4938c0942e3906124b3f81f58fd7e95cc128844 Parents: b0c4e04 Author: Salim Achouche <sachouc...@gmail.com> Authored: Tue Oct 24 10:12:19 2017 -0700 Committer: Parth Chandra <par...@apache.org> Committed: Tue Oct 24 11:17:18 2017 -0700 ---------------------------------------------------------------------- .../apache/drill/exec/server/BootStrapContext.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/e4938c09/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java index 9d8f125..1f9c81c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java @@ -254,8 +254,22 @@ public class BootStrapContext implements AutoCloseable { try { AutoCloseables.close(allocator, authProvider); + shutdown(loop); + shutdown(loop2); + } catch (final Exception e) { logger.error("Error while closing", e); } } + + private static void shutdown(EventLoopGroup loopGroup) { + if (loopGroup != null && !(loopGroup.isShutdown() || loopGroup.isShuttingDown())) { + try { + loopGroup.shutdownGracefully(); + + } catch (final Exception e) { + logger.error("Error while closing", e); + } + } + } }
