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 om...@apache.org on 2011/03/04 05:05:17 UTC
svn commit: r1077341 - in
/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop:
mapred/JobInProgress.java mapreduce/JobContext.java
Author: omalley
Date: Fri Mar 4 04:05:17 2011
New Revision: 1077341
URL: http://svn.apache.org/viewvc?rev=1077341&view=rev
Log:
commit 2a9b49611c793c9da0d863c56e304afd309a7e98
Author: Devaraj Das <dd...@yahoo-inc.com>
Date: Fri Mar 19 01:10:57 2010 -0700
MAPREDUCE:1532 from https://issues.apache.org/jira/secure/attachment/12439248/1532-bp20.4.2.patch
+++ b/YAHOO-CHANGES.txt
+ MAPREDUCE-1532. Fixes a javadoc and an exception message in JobInProgress
+ when the authenticated user is different from the user in conf. (ddas)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/JobContext.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=1077341&r1=1077340&r2=1077341&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Fri Mar 4 04:05:17 2011
@@ -360,8 +360,9 @@ public class JobInProgress {
this.conf.setUser(user);
}
if (!conf.getUser().equals(user)) {
- String desc = "The username obtained from the conf doesn't " +
- "match the username the user authenticated as";
+ String desc = "The username " + conf.getUser() + " obtained from the " +
+ "conf doesn't match the username " + user + " the user " +
+ "authenticated as";
AuditLogger.logFailure(user,
QueueManager.QueueOperation.SUBMIT_JOB.name(), conf.getUser(),
jobId.toString(), desc);
Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/JobContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/JobContext.java?rev=1077341&r1=1077340&r2=1077341&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/JobContext.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapreduce/JobContext.java Fri Mar 4 04:05:17 2011
@@ -67,6 +67,9 @@ public class JobContext {
public static final String USER_LOG_RETAIN_HOURS =
"mapred.userlog.retain.hours";
+ /**
+ * The UserGroupInformation object that has a reference to the current user
+ */
protected UserGroupInformation ugi;
public JobContext(Configuration conf, JobID jobId) {