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

HADOOP-8932. Merging change 1398883 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398885 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2012-10-16 16:57:23 +00:00
parent 20a5d16b2d
commit c86cccbf3d
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,6 +781,8 @@ Release 0.23.5 - UNRELEASED
NEW FEATURES NEW FEATURES
IMPROVEMENTS IMPROVEMENTS
HADOOP-8923. JNI-based user-group mapping modules can be too chatty on
lookup failures. (Kihwal Lee via suresh)
OPTIMIZATIONS OPTIMIZATIONS

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsMapping.java
View File

@ -48,7 +48,7 @@ public class JniBasedUnixGroupsMapping implements GroupMappingServiceProvider {
throw new RuntimeException("Bailing out since native library couldn't " + throw new RuntimeException("Bailing out since native library couldn't " +
"be loaded"); "be loaded");
} }
LOG.info("Using JniBasedUnixGroupsMapping for Group resolution"); LOG.debug("Using JniBasedUnixGroupsMapping for Group resolution");
} }
@Override @Override
@ -57,7 +57,11 @@ public class JniBasedUnixGroupsMapping implements GroupMappingServiceProvider {
try { try {
groups = getGroupForUser(user); groups = getGroupForUser(user);
} catch (Exception e) { } catch (Exception e) {
LOG.warn("Error getting groups for " + user, e); if (LOG.isDebugEnabled()) {
LOG.debug("Error getting groups for " + user, e);
} else {
LOG.info("Error getting groups for " + user + ": " + e.getMessage());
}
} }
return Arrays.asList(groups); return Arrays.asList(groups);
} }

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java
View File

@ -52,7 +52,7 @@ public class JniBasedUnixGroupsNetgroupMapping
throw new RuntimeException("Bailing out since native library couldn't " + throw new RuntimeException("Bailing out since native library couldn't " +
"be loaded"); "be loaded");
} }
LOG.info("Using JniBasedUnixGroupsNetgroupMapping for Netgroup resolution"); LOG.debug("Using JniBasedUnixGroupsNetgroupMapping for Netgroup resolution");
} }
/** /**
@ -115,7 +115,12 @@ public class JniBasedUnixGroupsNetgroupMapping
// JNI code does not expect '@' at the begining of the group name // JNI code does not expect '@' at the begining of the group name
users = getUsersForNetgroupJNI(netgroup.substring(1)); users = getUsersForNetgroupJNI(netgroup.substring(1));
} catch (Exception e) { } catch (Exception e) {
LOG.warn("error getting users for netgroup " + netgroup, e); if (LOG.isDebugEnabled()) {
LOG.debug("Error getting users for netgroup " + netgroup, e);
} else {
LOG.info("Error getting users for netgroup " + netgroup +
": " + e.getMessage());
}
} }
if (users != null && users.length != 0) { if (users != null && users.length != 0) {
return Arrays.asList(users); return Arrays.asList(users);