From 6175155cf4ec61b1cad3120957ac2784e99bedcd Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Fri, 24 Aug 2012 14:17:45 +0000 Subject: [PATCH] svn merge -c 1376929 FIXES: HADOOP-8725. MR is broken when security is off (daryn via bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376931 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/security/UserGroupInformation.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 7f70570ce73..b46e37b0398 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -798,6 +798,8 @@ Release 0.23.3 - UNRELEASED HADOOP-8709. globStatus changed behavior from 0.20/1.x (Jason Lowe via bobby) + HADOOP-8725. MR is broken when security is off (daryn via bobby) + Release 0.23.2 - UNRELEASED NEW FEATURES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index 967f0df89ff..0d3c4822892 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -642,7 +642,7 @@ static UserGroupInformation getLoginUser() throws IOException { AuthenticationMethod.SIMPLE); loginUser = new UserGroupInformation(login.getSubject()); String fileLocation = System.getenv(HADOOP_TOKEN_FILE_LOCATION); - if (fileLocation != null && isSecurityEnabled()) { + if (fileLocation != null) { // load the token storage file and put all of the tokens into the // user. Credentials cred = Credentials.readTokenStorageFile(