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

merge -c 1504874 FIXES: HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504875 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daryn Sharp 2013-07-19 13:39:50 +00:00
parent f6b0fa487b
commit 69aaf11467
2 changed files with 8 additions and 2 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

@ -27,6 +27,8 @@ Release 2.3.0 - UNRELEASED
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
BUG FIXES BUG FIXES
HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error

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

@ -208,11 +208,15 @@ public class UserGroupInformation {
* A method to initialize the fields that depend on a configuration. * A method to initialize the fields that depend on a configuration.
* Must be called before useKerberos or groups is used. * Must be called before useKerberos or groups is used.
*/ */
private static synchronized void ensureInitialized() { private static void ensureInitialized() {
if (conf == null) { if (conf == null) {
synchronized(UserGroupInformation.class) {
if (conf == null) { // someone might have beat us
initialize(new Configuration(), false); initialize(new Configuration(), false);
} }
} }
}
}
/** /**
* Initialize UGI and related classes. * Initialize UGI and related classes.