[22/49] hadoop git commit: HADOOP-11692. Improve authentication failure WARN message to avoid user confusion. Contributed by Yongjun Zhang.

2015-03-12 Thread zjshen 
HADOOP-11692. Improve authentication failure WARN message to avoid user 
confusion. Contributed by Yongjun Zhang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de1101cb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de1101cb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de1101cb

Branch: refs/heads/YARN-2928
Commit: de1101cb5be2d8efd0ef4945f64ccfe7cbd01049
Parents: 42e3a80
Author: Yongjun Zhang yzh...@cloudera.com
Authored: Mon Mar 9 11:55:32 2015 -0700
Committer: Yongjun Zhang yzh...@cloudera.com
Committed: Mon Mar 9 11:55:32 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 .../src/main/java/org/apache/hadoop/ipc/Server.java | 9 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/de1101cb/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 37604c4..d5a8463 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1070,6 +1070,9 @@ Release 2.7.0 - UNRELEASED
 HADOOP-11686. MiniKDC cannot change ORG_NAME or ORG_DOMAIN.
 (Duo Zhang via wheat9)
 
+HADOOP-11692. Improve authentication failure WARN message to avoid user
+confusion. (Yongjun Zhang)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/de1101cb/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index 893e0eb..d2d61b3 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
@@ -1324,10 +1324,15 @@ public abstract class Server {
   saslResponse = processSaslMessage(saslMessage);
 } catch (IOException e) {
   rpcMetrics.incrAuthenticationFailures();
+  if (LOG.isDebugEnabled()) {
+LOG.debug(StringUtils.stringifyException(e));
+  }
   // attempting user could be null
+  IOException tce = (IOException) getTrueCause(e);
   AUDITLOG.warn(AUTH_FAILED_FOR + this.toString() + :
-  + attemptingUser +  ( + e.getLocalizedMessage() + ));
-  throw (IOException) getTrueCause(e);
+  + attemptingUser +  ( + e.getLocalizedMessage()
+  + ) with true cause: ( + tce.getLocalizedMessage() + ));
+  throw tce;
 }
 
 if (saslServer != null  saslServer.isComplete()) {

hadoop git commit: HADOOP-11692. Improve authentication failure WARN message to avoid user confusion. Contributed by Yongjun Zhang.

2015-03-09 Thread yjzhangal 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d8d8ed35f - 45cc7514f


HADOOP-11692. Improve authentication failure WARN message to avoid user 
confusion. Contributed by Yongjun Zhang.

(cherry picked from commit de1101cb5be2d8efd0ef4945f64ccfe7cbd01049)

Conflicts:

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/45cc7514
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/45cc7514
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/45cc7514

Branch: refs/heads/branch-2
Commit: 45cc7514f5c71526d0c6bedf5b1b3cb74511b941
Parents: d8d8ed3
Author: Yongjun Zhang yzh...@cloudera.com
Authored: Mon Mar 9 11:55:32 2015 -0700
Committer: Yongjun Zhang yzh...@cloudera.com
Committed: Mon Mar 9 12:12:29 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 .../src/main/java/org/apache/hadoop/ipc/Server.java | 9 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/45cc7514/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 e095bbd..a8f5313 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -659,6 +659,9 @@ Release 2.7.0 - UNRELEASED
 HADOOP-11686. MiniKDC cannot change ORG_NAME or ORG_DOMAIN.
 (Duo Zhang via wheat9)
 
+HADOOP-11692. Improve authentication failure WARN message to avoid user
+confusion. (Yongjun Zhang)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/45cc7514/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index f63b54f..66fefdd 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
@@ -1297,10 +1297,15 @@ public abstract class Server {
   saslResponse = processSaslMessage(saslMessage);
 } catch (IOException e) {
   rpcMetrics.incrAuthenticationFailures();
+  if (LOG.isDebugEnabled()) {
+LOG.debug(StringUtils.stringifyException(e));
+  }
   // attempting user could be null
+  IOException tce = (IOException) getCauseForInvalidToken(e);
   AUDITLOG.warn(AUTH_FAILED_FOR + this.toString() + :
-  + attemptingUser +  ( + e.getLocalizedMessage() + ));
-  throw (IOException) getCauseForInvalidToken(e);
+  + attemptingUser +  ( + e.getLocalizedMessage()
+  + ) with true cause: ( + tce.getLocalizedMessage() + ));
+  throw tce;
 }
 
 if (saslServer != null  saslServer.isComplete()) {

hadoop git commit: HADOOP-11692. Improve authentication failure WARN message to avoid user confusion. Contributed by Yongjun Zhang.

2015-03-09 Thread yjzhangal 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 42e3a8051 - de1101cb5


HADOOP-11692. Improve authentication failure WARN message to avoid user 
confusion. Contributed by Yongjun Zhang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de1101cb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de1101cb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de1101cb

Branch: refs/heads/trunk
Commit: de1101cb5be2d8efd0ef4945f64ccfe7cbd01049
Parents: 42e3a80
Author: Yongjun Zhang yzh...@cloudera.com
Authored: Mon Mar 9 11:55:32 2015 -0700
Committer: Yongjun Zhang yzh...@cloudera.com
Committed: Mon Mar 9 11:55:32 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 .../src/main/java/org/apache/hadoop/ipc/Server.java | 9 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/de1101cb/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 37604c4..d5a8463 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1070,6 +1070,9 @@ Release 2.7.0 - UNRELEASED
 HADOOP-11686. MiniKDC cannot change ORG_NAME or ORG_DOMAIN.
 (Duo Zhang via wheat9)
 
+HADOOP-11692. Improve authentication failure WARN message to avoid user
+confusion. (Yongjun Zhang)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/de1101cb/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index 893e0eb..d2d61b3 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
@@ -1324,10 +1324,15 @@ public abstract class Server {
   saslResponse = processSaslMessage(saslMessage);
 } catch (IOException e) {
   rpcMetrics.incrAuthenticationFailures();
+  if (LOG.isDebugEnabled()) {
+LOG.debug(StringUtils.stringifyException(e));
+  }
   // attempting user could be null
+  IOException tce = (IOException) getTrueCause(e);
   AUDITLOG.warn(AUTH_FAILED_FOR + this.toString() + :
-  + attemptingUser +  ( + e.getLocalizedMessage() + ));
-  throw (IOException) getTrueCause(e);
+  + attemptingUser +  ( + e.getLocalizedMessage()
+  + ) with true cause: ( + tce.getLocalizedMessage() + ));
+  throw tce;
 }
 
 if (saslServer != null  saslServer.isComplete()) {