Repository: giraph Updated Branches: refs/heads/trunk dcbb48058 -> 01d11687d
GIRAPH-872 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/01d11687 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/01d11687 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/01d11687 Branch: refs/heads/trunk Commit: 01d11687dd2e89f97e0b5c557bbfd0cefb6ed625 Parents: dcbb480 Author: Claudio Martella <[email protected]> Authored: Fri Mar 21 22:51:41 2014 +0100 Committer: Claudio Martella <[email protected]> Committed: Fri Mar 21 22:51:41 2014 +0100 ---------------------------------------------------------------------- CHANGELOG | 3 +++ .../giraph/comm/netty/handler/RequestServerHandler.java | 2 +- .../giraph/comm/netty/handler/ResponseClientHandler.java | 7 +++---- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/01d11687/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 6287418..7c7a0aa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-872: Minor inconsistencies with netty handler logic after netty 4 upgrade + (cmuchinsky via claudio) + 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) http://git-wip-us.apache.org/repos/asf/giraph/blob/01d11687/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java b/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java index c033746..601cd2f 100644 --- a/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java +++ b/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/RequestServerHandler.java @@ -161,7 +161,7 @@ public abstract class RequestServerHandler<R> extends public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { LOG.warn("exceptionCaught: Channel failed with " + - "remote address " + ctx.channel().remoteAddress(), cause.getCause()); + "remote address " + ctx.channel().remoteAddress(), cause); } /** http://git-wip-us.apache.org/repos/asf/giraph/blob/01d11687/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java b/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java index 463a47e..f0fd1e5 100644 --- a/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java +++ b/giraph-core/src/main/java/org/apache/giraph/comm/netty/handler/ResponseClientHandler.java @@ -134,15 +134,14 @@ public class ResponseClientHandler extends ChannelInboundHandlerAdapter { LOG.debug("channelClosed: Closed the channel on " + ctx.channel().remoteAddress()); } + ctx.fireChannelInactive(); } @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { - if (LOG.isDebugEnabled()) { - LOG.warn("exceptionCaught: Channel failed with " + - "remote address " + ctx.channel().remoteAddress(), cause.getCause()); - } + LOG.warn("exceptionCaught: Channel failed with " + + "remote address " + ctx.channel().remoteAddress(), cause); } }
