commit 5cb6e31c80e921ad4d577d04c473e9b23aca6dbe
author Devaraj Das <ddas@apache.org> Wed Aug 04 20:55:32 2010 +0000
committer Devaraj Das <ddas@apache.org> Wed Aug 04 20:55:32 2010 +0000
tree c375913ebfc4aad9ad5d8134e5e8ec1665894762
parent 2452f9fdd24212fd545bfe9d9c853df83c6cc3f7

MAPREDUCE-1992. Fixes a problem to do with bringing up the JobTracker in unsecure mode. Contributed by Kan Zhang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@982400 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index e7fc5ad..c525324 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -233,6 +233,9 @@
     MAPREDUCE-1900. TaskTracker and JobTracker closes FileSystems, opened on
     behalf of users that it no longer requires. (Kan Zhang and ddas via ddas)
 
+    MAPREDUCE-1992. Fixes a problem to do with bringing up the JobTracker in
+    unsecure mode. (Kan Zhang via ddas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/java/org/apache/hadoop/mapred/JobTracker.java

diff --git a/src/java/org/apache/hadoop/mapred/JobTracker.java b/src/java/org/apache/hadoop/mapred/JobTracker.java
index 2e4d9c5..e5d3bc3 100644
--- a/src/java/org/apache/hadoop/mapred/JobTracker.java
+++ b/src/java/org/apache/hadoop/mapred/JobTracker.java
@@ -1382,11 +1382,7 @@
     UserGroupInformation.setConfiguration(conf);
     SecurityUtil.login(conf, JTConfig.JT_KEYTAB_FILE, JTConfig.JT_USER_NAME,
         localMachine);
-    if (UserGroupInformation.isLoginKeytabBased()) {
-      mrOwner = UserGroupInformation.getLoginUser();
-    } else {
-      mrOwner = UserGroupInformation.getCurrentUser();
-    }
+    mrOwner = UserGroupInformation.getCurrentUser();
     
     supergroup = conf.get(MR_SUPERGROUP, "supergroup");
     LOG.info("Starting jobtracker with owner as " + mrOwner.getShortUserName() 
@@ -4601,11 +4597,7 @@
     UserGroupInformation.setConfiguration(conf);
     SecurityUtil.login(conf, JTConfig.JT_KEYTAB_FILE, JTConfig.JT_USER_NAME,
         localMachine);
-    if (UserGroupInformation.isLoginKeytabBased()) {
-      mrOwner = UserGroupInformation.getLoginUser();
-    } else {
-      mrOwner = UserGroupInformation.getCurrentUser();
-    }
+    mrOwner = UserGroupInformation.getCurrentUser();
     supergroup = conf.get(MRConfig.MR_SUPERGROUP, "supergroup");
     
     secretManager = null;

src/java/org/apache/hadoop/mapred/TaskTracker.java

diff --git a/src/java/org/apache/hadoop/mapred/TaskTracker.java b/src/java/org/apache/hadoop/mapred/TaskTracker.java
index 72f9c81..9d8897c 100644
--- a/src/java/org/apache/hadoop/mapred/TaskTracker.java
+++ b/src/java/org/apache/hadoop/mapred/TaskTracker.java
@@ -586,11 +586,7 @@
   synchronized void initialize() throws IOException, InterruptedException {
     UserGroupInformation.setConfiguration(fConf);
     SecurityUtil.login(fConf, TTConfig.TT_KEYTAB_FILE, TTConfig.TT_USER_NAME);
-    if (UserGroupInformation.isLoginKeytabBased()) {
-      mrOwner = UserGroupInformation.getLoginUser();
-    } else {
-      mrOwner = UserGroupInformation.getCurrentUser();
-    }
+    mrOwner = UserGroupInformation.getCurrentUser();
 
     supergroup = fConf.get(MRConfig.MR_SUPERGROUP, "supergroup");
     LOG.info("Starting tasktracker with owner as " + mrOwner.getShortUserName()