HADOOP-4194. Added the JobConf and JobID to job-related methods in obTrackerInstrumentation for better metrics. Contributed by Mac Yang.

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

CHANGES.txt

@@ -362,6 +362,9 @@ Trunk (unreleased changes)
     HADOOP-4083. Changed the configuration attribute queue.name to
     mapred.job.queue.name. (Hemanth Yamijala via acmurthy) 
 
+    HADOOP-4194. Added the JobConf and JobID to job-related methods in
+    JobTrackerInstrumentation for better metrics. (Mac Yang via acmurthy) 
+
   OPTIMIZATIONS
 
     HADOOP-3556. Removed lock contention in MD5Hash by changing the 

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

@@ -1738,7 +1738,7 @@ class JobInProgress {
       // might try to finalize
       garbageCollect();
       
-      metrics.completeJob();
+      metrics.completeJob(this.conf, this.status.getJobID());
     }
   }
   

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

@@ -2184,7 +2184,7 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
         }
       }
     }
-    myInstrumentation.submitJob();
+    myInstrumentation.submitJob(this.conf, jobId);
     return job.getStatus();
   }
 

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

@@ -39,10 +39,10 @@ public class JobTrackerInstrumentation {
   public void completeReduce(TaskAttemptID taskAttemptID)
   {  }
   
-  public void submitJob() 
+  public void submitJob(JobConf conf, JobID id) 
   { }
     
-  public void completeJob() 
+  public void completeJob(JobConf conf, JobID id) 
   { }
 
-}
+}

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

@@ -89,11 +89,11 @@ class JobTrackerMetricsInst extends JobTrackerInstrumentation implements Updater
     ++numReduceTasksCompleted;
   }
     
-  public synchronized void submitJob() {
+  public synchronized void submitJob(JobConf conf, JobID id) {
     ++numJobsSubmitted;
   }
     
-  public synchronized void completeJob() {
+  public synchronized void completeJob(JobConf conf, JobID id) {
     ++numJobsCompleted;
   }
-}
+}