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 da...@apache.org on 2013/07/19 15:39:51 UTC
svn commit: r1504875 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt
src/main/java/org/apache/hadoop/security/UserGroupInformation.java
Author: daryn
Date: Fri Jul 19 13:39:50 2013
New Revision: 1504875
URL: http://svn.apache.org/r1504875
Log:
merge -c 1504874 FIXES: HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
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=1504875&r1=1504874&r2=1504875&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 Fri Jul 19 13:39:50 2013
@@ -27,6 +27,8 @@ Release 2.3.0 - UNRELEASED
OPTIMIZATIONS
+ HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
+
BUG FIXES
HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error
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=1504875&r1=1504874&r2=1504875&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 Fri Jul 19 13:39:50 2013
@@ -208,9 +208,13 @@ public class UserGroupInformation {
* A method to initialize the fields that depend on a configuration.
* Must be called before useKerberos or groups is used.
*/
- private static synchronized void ensureInitialized() {
+ private static void ensureInitialized() {
if (conf == null) {
- initialize(new Configuration(), false);
+ synchronized(UserGroupInformation.class) {
+ if (conf == null) { // someone might have beat us
+ initialize(new Configuration(), false);
+ }
+ }
}
}