You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2016/02/12 01:59:24 UTC
[3/3] hadoop git commit: HADOOP-12795. KMS does not log detailed
stack trace for unexpected errors. Contributed by Chris Nauroth.
HADOOP-12795. KMS does not log detailed stack trace for unexpected errors. Contributed by Chris Nauroth.
(cherry picked from commit 70c756d35e6ed5608ce82d1a6fbfb02e19af5ecf)
(cherry picked from commit 25dcb88630eb4a6c30db4f20323beeb7fd2584cc)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ddd82d24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ddd82d24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ddd82d24
Branch: refs/heads/branch-2.8
Commit: ddd82d24be594c1c808e9fadf9917f037cbc4c66
Parents: 379c2f4
Author: cnauroth <cn...@apache.org>
Authored: Thu Feb 11 16:52:58 2016 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Thu Feb 11 16:53:21 2016 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../hadoop/crypto/key/kms/server/KMSExceptionsProvider.java | 2 ++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ddd82d24/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0101d9f..7a26c3d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -994,6 +994,9 @@ Release 2.8.0 - UNRELEASED
"hadoop.workaround.non.threadsafe.getpwuid" is different between
core-default.xml and NativeIO.java (Akira AJISAKA via cmccabe)
+ HADOOP-12795. KMS does not log detailed stack trace for unexpected errors.
+ (cnauroth)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ddd82d24/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java
index 5cb0885..aa9d299 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java
@@ -86,12 +86,14 @@ public class KMSExceptionsProvider implements ExceptionMapper<Exception> {
status = Response.Status.FORBIDDEN;
} else if (exception instanceof IOException) {
status = Response.Status.INTERNAL_SERVER_ERROR;
+ log(status, throwable);
} else if (exception instanceof UnsupportedOperationException) {
status = Response.Status.BAD_REQUEST;
} else if (exception instanceof IllegalArgumentException) {
status = Response.Status.BAD_REQUEST;
} else {
status = Response.Status.INTERNAL_SERVER_ERROR;
+ log(status, throwable);
}
if (doAudit) {
KMSWebApp.getKMSAudit().error(KMSMDCFilter.getUgi(),