Author: szetszwo Date: Wed Apr 2 01:01:50 2014 New Revision: 1583843 URL: http://svn.apache.org/r1583843 Log: svn merge -c 1583842 from trunk for HADOOP-10455. When there is an exception, ipc.Server should first check whether it is an terse exception.
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1583842 Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1583843&r1=1583842&r2=1583843&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Apr 2 01:01:50 2014 @@ -45,6 +45,9 @@ Release 2.4.1 - UNRELEASED BUG FIXES + HADOOP-10455. When there is an exception, ipc.Server should first check + whether it is an terse exception. (szetszwo) + Release 2.4.0 - 2014-04-07 INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1583842 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1583842 Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1583842 Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1583843&r1=1583842&r2=1583843&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java Wed Apr 2 01:01:50 2014 @@ -2021,16 +2021,15 @@ public abstract class Server { if (e instanceof UndeclaredThrowableException) { e = e.getCause(); } - String logMsg = Thread.currentThread().getName() + ", call " + call + ": error: " + e; - if (e instanceof RuntimeException || e instanceof Error) { + String logMsg = Thread.currentThread().getName() + ", call " + call; + if (exceptionsHandler.isTerse(e.getClass())) { + // Don't log the whole stack trace. Way too noisy! + LOG.info(logMsg + ": " + e); + } else if (e instanceof RuntimeException || e instanceof Error) { // These exception types indicate something is probably wrong // on the server side, as opposed to just a normal exceptional // result. LOG.warn(logMsg, e); - } else if (exceptionsHandler.isTerse(e.getClass())) { - // Don't log the whole stack trace of these exceptions. - // Way too noisy! - LOG.info(logMsg); } else { LOG.info(logMsg, e); }