Author: ddas
Date: Wed Aug 4 20:55:32 2010
New Revision: 982400
URL: http://svn.apache.org/viewvc?rev=982400&view=rev
Log:
MAPREDUCE-1992. Fixes a problem to do with bringing up the JobTracker in
unsecure mode. Contributed by Kan Zhang.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=982400&r1=982399&r2=982400&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Wed Aug 4 20:55:32 2010
@@ -233,6 +233,9 @@ Trunk (unreleased changes)
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
Modified:
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=982400&r1=982399&r2=982400&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
(original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
Wed Aug 4 20:55:32 2010
@@ -1382,11 +1382,7 @@ public class JobTracker implements MRCon
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 @@ public class JobTracker implements MRCon
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;
Modified:
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=982400&r1=982399&r2=982400&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
(original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
Wed Aug 4 20:55:32 2010
@@ -586,11 +586,7 @@ public class TaskTracker
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()
