Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1585538 from trunk for HADOOP-10466. Lower the log level in UserGroupInformation. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585539 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2014-04-07 18:07:57 +00:00
parent 48ad73577b
commit d7d7f090cb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -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

16
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
View File

@ -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) {