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 aa...@apache.org on 2015/05/08 11:19:02 UTC

hadoop git commit: MAPREDUCE-6079. Rename JobImpl#username to reporterUserName. Contributed by Tsuyoshi Ozawa.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 888e63099 -> ecfa05227


MAPREDUCE-6079. Rename JobImpl#username to reporterUserName. Contributed by Tsuyoshi Ozawa.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ecfa0522
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ecfa0522
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ecfa0522

Branch: refs/heads/trunk
Commit: ecfa05227489724f12775b94a9f9184b66e865af
Parents: 888e630
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri May 8 18:16:58 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri May 8 18:16:58 2015 +0900

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                   |  3 +++
 .../hadoop/mapreduce/v2/app/job/impl/JobImpl.java      | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ecfa0522/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 2120194..265b5b1 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -313,6 +313,9 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-6279. AM should explicity exit JVM after all services have
     stopped (Eric Payne via jlowe)
 
+    MAPREDUCE-6079. Rename JobImpl#username to reporterUserName.
+    (Tsuyoshi Ozawa via aajisaka)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ecfa0522/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
index dff5ef4..6e9f13c 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
@@ -160,7 +160,7 @@ public class JobImpl implements org.apache.hadoop.mapreduce.v2.app.job.Job,
   private final ApplicationAttemptId applicationAttemptId;
   private final Clock clock;
   private final JobACLsManager aclsManager;
-  private final String username;
+  private final String reporterUserName;
   private final Map<JobACL, AccessControlList> jobACLs;
   private float setupWeight = 0.05f;
   private float cleanupWeight = 0.05f;
@@ -688,7 +688,7 @@ public class JobImpl implements org.apache.hadoop.mapreduce.v2.app.job.Job,
     this.jobTokenSecretManager = jobTokenSecretManager;
 
     this.aclsManager = new JobACLsManager(conf);
-    this.username = System.getProperty("user.name");
+    this.reporterUserName = System.getProperty("user.name");
     this.jobACLs = aclsManager.constructJobACLs(conf);
 
     ThreadFactory threadFactory = new ThreadFactoryBuilder()
@@ -868,13 +868,14 @@ public class JobImpl implements org.apache.hadoop.mapreduce.v2.app.job.Job,
       }
 
       if (getInternalState() == JobStateInternal.NEW) {
-        return MRBuilderUtils.newJobReport(jobId, jobName, username, state,
-            appSubmitTime, startTime, finishTime, setupProgress, 0.0f, 0.0f,
-            cleanupProgress, jobFile, amInfos, isUber, diagsb.toString());
+        return MRBuilderUtils.newJobReport(jobId, jobName, reporterUserName,
+            state, appSubmitTime, startTime, finishTime, setupProgress, 0.0f,
+            0.0f, cleanupProgress, jobFile, amInfos, isUber, diagsb.toString());
       }
 
       computeProgress();
-      JobReport report = MRBuilderUtils.newJobReport(jobId, jobName, username,
+      JobReport report = MRBuilderUtils.newJobReport(jobId, jobName,
+          reporterUserName,
           state, appSubmitTime, startTime, finishTime, setupProgress,
           this.mapProgress, this.reduceProgress,
           cleanupProgress, jobFile, amInfos, isUber, diagsb.toString());