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 sz...@apache.org on 2014/04/07 20:07:58 UTC
svn commit: r1585539 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./
CHANGES.txt src/ src/main/java/
src/main/java/org/apache/hadoop/security/UserGroupInformation.java
Author: szetszwo
Date: Mon Apr 7 18:07:57 2014
New Revision: 1585539
URL: http://svn.apache.org/r1585539
Log:
svn merge -c 1585538 from trunk for HADOOP-10466. Lower the log level in UserGroupInformation.
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/security/UserGroupInformation.java
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1585538
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=1585539&r1=1585538&r2=1585539&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 Mon Apr 7 18:07:57 2014
@@ -50,6 +50,9 @@ Release 2.4.1 - UNRELEASED
IMPROVEMENTS
+ HADOOP-10466. Lower the log level in UserGroupInformation. (Nicolas
+ Liochon via szetszwo)
+
OPTIMIZATIONS
BUG FIXES
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1585538
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1585538
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:r1585538
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1585539&r1=1585538&r2=1585539&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Mon Apr 7 18:07:57 2014
@@ -949,7 +949,9 @@ public class UserGroupInformation {
// register most recent relogin attempt
user.setLastLogin(now);
try {
- LOG.info("Initiating logout for " + getUserName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Initiating logout for " + getUserName());
+ }
synchronized (UserGroupInformation.class) {
// clear up the kerberos state. But the tokens are not cleared! As per
// the Java kerberos login module code, only the kerberos credentials
@@ -960,7 +962,9 @@ public class UserGroupInformation {
login = newLoginContext(
HadoopConfiguration.KEYTAB_KERBEROS_CONFIG_NAME, getSubject(),
new HadoopConfiguration());
- LOG.info("Initiating re-login for " + keytabPrincipal);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Initiating re-login for " + keytabPrincipal);
+ }
start = Time.now();
login.login();
metrics.loginSuccess.add(Time.now() - start);
@@ -1001,7 +1005,9 @@ public class UserGroupInformation {
// register most recent relogin attempt
user.setLastLogin(now);
try {
- LOG.info("Initiating logout for " + getUserName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Initiating logout for " + getUserName());
+ }
//clear up the kerberos state. But the tokens are not cleared! As per
//the Java kerberos login module code, only the kerberos credentials
//are cleared
@@ -1011,7 +1017,9 @@ public class UserGroupInformation {
login =
newLoginContext(HadoopConfiguration.USER_KERBEROS_CONFIG_NAME,
getSubject(), new HadoopConfiguration());
- LOG.info("Initiating re-login for " + getUserName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Initiating re-login for " + getUserName());
+ }
login.login();
setLogin(login);
} catch (LoginException le) {