Author: tucu
Date: Mon Jul 2 16:42:28 2012
New Revision: 1356332
URL: http://svn.apache.org/viewvc?rev=1356332&view=rev
Log:
Merge -r 1356329:1356330 from trunk to branch. FIXES: HDFS-3575
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java?rev=1356332&r1=1356331&r2=1356332&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java
Mon Jul 2 16:42:28 2012
@@ -91,7 +91,7 @@ public class HttpFSExceptionProvider ext
String path = MDC.get("path");
String message = getOneLineMessage(throwable);
AUDIT_LOG.warn("FAILED [{}:{}] response [{}] {}", new Object[]{method,
path, status, message});
- LOG.warn("[{}:{}] response [{}] {}", new Object[]{method, path, status,
message, throwable});
+ LOG.warn("[{}:{}] response [{}] {}", new Object[]{method, path, status,
message}, throwable);
}
}
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1356332&r1=1356331&r2=1356332&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Mon Jul 2 16:42:28 2012
@@ -245,6 +245,8 @@ Release 2.0.1-alpha - UNRELEASED
block in a namenode and the reported block from a datanode do not match.
(Ashish Singhi via szetszwo)
+ HDFS-3575. HttpFS does not log Exception Stacktraces (brocknoland via tucu)
+
BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd)
