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

Skip the proxy user check if the ugi has not been initialized. Contributed by Daryn Sharp 

(cherry picked from commit 73e9120ad7)
This commit is contained in:
Rushabh Shah 2018-05-21 12:33:00 -05:00
parent a89e65faa0
commit 1c594639f1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -281,7 +281,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
} }
private static boolean getRestrictParserDefault(Object resource) { private static boolean getRestrictParserDefault(Object resource) {
if (resource instanceof String) { if (resource instanceof String || !UserGroupInformation.isInitialized()) {
return false; return false;
} }
UserGroupInformation user; UserGroupInformation user;

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

@ -287,14 +287,18 @@ public class UserGroupInformation {
public static final String HADOOP_TOKEN_FILE_LOCATION = public static final String HADOOP_TOKEN_FILE_LOCATION =
"HADOOP_TOKEN_FILE_LOCATION"; "HADOOP_TOKEN_FILE_LOCATION";
public static boolean isInitialized() {
return conf != null;
}
/** /**
* 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 void ensureInitialized() { private static void ensureInitialized() {
if (conf == null) { if (!isInitialized()) {
synchronized(UserGroupInformation.class) { synchronized(UserGroupInformation.class) {
if (conf == null) { // someone might have beat us if (!isInitialized()) { // someone might have beat us
initialize(new Configuration(), false); initialize(new Configuration(), false);
} }
} }