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 ac...@apache.org on 2013/07/05 05:18:35 UTC
svn commit: r1499903 - in /hadoop/common/branches/branch-1.2: CHANGES.txt
src/mapred/org/apache/hadoop/mapred/JobTracker.java
Author: acmurthy
Date: Fri Jul 5 03:18:34 2013
New Revision: 1499903
URL: http://svn.apache.org/r1499903
Log:
Merge -c 1499902 from branch-1 to branch-1.2 to fix MAPREDUCE-5375. Use short name for renewing delegation tokens. Contributed by Venkat Ranganathan.
Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1499903&r1=1499902&r2=1499903&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Fri Jul 5 03:18:34 2013
@@ -46,6 +46,9 @@ Release 1.2.1 - Unreleased
MAPREDUCE-5364. Deadlock between RenewalTimerTask methods cancel() and run().
(kkambatl via tucu)
+ MAPREDUCE-5375. Use short name for renewing delegation tokens. (Venkat
+ Ranganathan via acmurthy)
+
Release 1.2.0 - 2013.05.05
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1499903&r1=1499902&r2=1499903&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JobTracker.java Fri Jul 5 03:18:34 2013
@@ -3874,7 +3874,7 @@ public class JobTracker implements MRCon
throw new IOException(
"Delegation Token can be issued only with kerberos authentication");
}
- String user = UserGroupInformation.getCurrentUser().getUserName();
+ String user = UserGroupInformation.getCurrentUser().getShortUserName();
return secretManager.renewToken(token, user);
}