Author: kihwal
Date: Fri Mar 8 20:18:47 2013
New Revision: 1454530
URL: http://svn.apache.org/r1454530
Log:
svn merge -c 1205697 Merging from trunk to branch-0.23 to fix HADOOP-7358.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1454530&r1=1454529&r2=1454530&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Mar 8 20:18:47 2013
@@ -33,6 +33,9 @@ Release 0.23.7 - UNRELEASED
HADOOP-9374. Add tokens from -tokenCacheFile into UGI (daryn)
+ HADOOP-7358. Improve log levels when exceptions caught in RPC handler
+ (Todd Lipcon via shv)
+
OPTIMIZATIONS
HADOOP-9147. Add missing fields to FIleStatus.toString.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1454530&r1=1454529&r2=1454530&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Fri Mar 8 20:18:47 2013
@@ -1538,7 +1538,16 @@ public abstract class Server {
);
}
} catch (Throwable e) {
- LOG.info(getName() + ", call: " + call + ", error: ", e);
+ String logMsg = getName() + ", call " + call + ": error: " + e;
+ 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 {
+ LOG.info(logMsg, e);
+ }
+
errorClass = e.getClass().getName();
error = StringUtils.stringifyException(e);
// Remove redundant error class name from the beginning of the
stack trace
