Repository: giraph Updated Branches: refs/heads/trunk 4d227c289 -> dcbb48058
GIRAPH-871 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/dcbb4805 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/dcbb4805 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/dcbb4805 Branch: refs/heads/trunk Commit: dcbb4805887fa5dc2e3fb21c8a6769aa4172c986 Parents: 4d227c2 Author: Claudio Martella <[email protected]> Authored: Fri Mar 21 22:49:31 2014 +0100 Committer: Claudio Martella <[email protected]> Committed: Fri Mar 21 22:49:31 2014 +0100 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../org/apache/giraph/comm/netty/NettyClient.java | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/dcbb4805/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 360e0f8..6287418 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-871: Map task jvm never exits since netty 4 upgrade (cmuchinsky via claudio) + GIRAPH-869: Log Vertex/Edge Count for All Workers (yhdong via majakabiljo) GIRAPH-868: Fix race condition with WorkerProgress (majakabiljo) http://git-wip-us.apache.org/repos/asf/giraph/blob/dcbb4805/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyClient.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyClient.java b/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyClient.java index c40c2b8..ae40c3b 100644 --- a/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyClient.java +++ b/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyClient.java @@ -543,6 +543,9 @@ public class NettyClient { * Stop the client. */ public void stop() { + if (LOG.isInfoEnabled()) { + LOG.info("stop: Halting netty client"); + } // Close connections asynchronously, in a Netty-approved // way, without cleaning up thread pools until all channels // in addressChannelMap are closed (success or failure) @@ -561,18 +564,23 @@ public class NettyClient { if (LOG.isInfoEnabled()) { LOG.info("stop: reached wait threshold, " + done + " connections closed, releasing " + - "NettyClient.bootstrap resources now."); + "resources now."); } workerGroup.shutdownGracefully(); - ProgressableUtils.awaitTerminationFuture(executionGroup, context); if (executionGroup != null) { executionGroup.shutdownGracefully(); - ProgressableUtils.awaitTerminationFuture(executionGroup, context); } } } }); } + ProgressableUtils.awaitTerminationFuture(workerGroup, context); + if (executionGroup != null) { + ProgressableUtils.awaitTerminationFuture(executionGroup, context); + } + if (LOG.isInfoEnabled()) { + LOG.info("stop: Netty client halted"); + } } /**
