From commits-return-5738-apmail-zookeeper-commits-archive=zookeeper.apache.org@zookeeper.apache.org Mon Sep 11 22:08:00 2017 Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD80419398 for ; Mon, 11 Sep 2017 22:08:00 +0000 (UTC) Received: (qmail 83764 invoked by uid 500); 11 Sep 2017 22:08:00 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 83726 invoked by uid 500); 11 Sep 2017 22:07:59 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 83715 invoked by uid 99); 11 Sep 2017 22:07:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Sep 2017 22:07:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A58B4F578A; Mon, 11 Sep 2017 22:07:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: hanm@apache.org To: commits@zookeeper.apache.org Message-Id: <4e4e1586a13545ec9dc59900fb9c7ae2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?zookeeper_git_commit=3A_ZOOKEEPER-2809=3A_Unnecessary_st?= =?utf-8?q?ack-trace_in_server_when_the_client_dis=E2=80=A6?= Date: Mon, 11 Sep 2017 22:07:58 +0000 (UTC) Repository: zookeeper Updated Branches: refs/heads/branch-3.4 cd5e6b263 -> 34665cd5b ZOOKEEPER-2809: Unnecessary stack-trace in server when the client dis… Unnecessary stack-trace in server when the client disconnects unexpectedly. Backport from master, branch-3.5 to branch-3.4. Removes unnecessary stack traces from the catch blocks of method doIO in NIOServerCnxn. For EndOfStreamException stack trace is replaced with logging only the message and also contains the removal of stack traces for exceptions CancelledKeyException and IOException as per commit 6206b495 referenced in the ticket. This change is necessary as there are projects which consider all stack traces as bugs. For CancelledKeyException and IOException developers are still able to see stack traces at log level Debug. This change is in sync with master and branch-3.5. Author: Mark Fenes Reviewers: Abe Fine , Michael Han Closes #355 from mfenes/ZOOKEEPER-2809 Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/34665cd5 Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/34665cd5 Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/34665cd5 Branch: refs/heads/branch-3.4 Commit: 34665cd5bdbcb6aaeecb6b204028ef1ffab9f2d8 Parents: cd5e6b2 Author: Mark Fenes Authored: Mon Sep 11 15:07:55 2017 -0700 Committer: Michael Han Committed: Mon Sep 11 15:07:55 2017 -0700 ---------------------------------------------------------------------- .../org/apache/zookeeper/server/NIOServerCnxn.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/34665cd5/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java b/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java index 52d0626..f191129 100644 --- a/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java +++ b/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java @@ -363,9 +363,8 @@ public class NIOServerCnxn extends ServerCnxn { } } } catch (CancelledKeyException e) { - LOG.warn("Exception causing close of session 0x" - + Long.toHexString(sessionId) - + " due to " + e); + LOG.warn("CancelledKeyException causing close of session 0x" + + Long.toHexString(sessionId)); if (LOG.isDebugEnabled()) { LOG.debug("CancelledKeyException stack trace", e); } @@ -374,14 +373,15 @@ public class NIOServerCnxn extends ServerCnxn { // expecting close to log session closure close(); } catch (EndOfStreamException e) { - LOG.warn("caught end of stream exception",e); // tell user why - + LOG.warn(e.getMessage()); + if (LOG.isDebugEnabled()) { + LOG.debug("EndOfStreamException stack trace", e); + } // expecting close to log session closure close(); } catch (IOException e) { LOG.warn("Exception causing close of session 0x" - + Long.toHexString(sessionId) - + " due to " + e); + + Long.toHexString(sessionId) + ": " + e.getMessage()); if (LOG.isDebugEnabled()) { LOG.debug("IOException stack trace", e); }