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 cd...@apache.org on 2009/03/12 23:50:59 UTC

svn commit: r753045 - in /hadoop/core/branches/branch-0.19: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobTrackerMetricsInst.java src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java

Author: cdouglas
Date: Thu Mar 12 22:50:59 2009
New Revision: 753045

URL: http://svn.apache.org/viewvc?rev=753045&view=rev
Log:
HADOOP-5446. Restore TaskTracker metrics.

Modified:
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTrackerMetricsInst.java
    hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=753045&r1=753044&r2=753045&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Thu Mar 12 22:50:59 2009
@@ -68,6 +68,8 @@
     HADOOP-5440. Fixes a problem to do with removing a taskId from the list
     of taskIds that the TaskTracker's TaskMemoryManager manages.
     (Amareshwari Sriramadasu via ddas)
+
+    HADOOP-5446. Restore TaskTracker metrics. (cdouglas)
  
 Release 0.19.1 - 2009-02-23
 

Modified: hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTrackerMetricsInst.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTrackerMetricsInst.java?rev=753045&r1=753044&r2=753045&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTrackerMetricsInst.java (original)
+++ hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTrackerMetricsInst.java Thu Mar 12 22:50:59 2009
@@ -73,26 +73,32 @@
     }
   }
 
+  @Override
   public synchronized void launchMap(TaskAttemptID taskAttemptID) {
     ++numMapTasksLaunched;
   }
-    
+
+  @Override
   public synchronized void completeMap(TaskAttemptID taskAttemptID) {
     ++numMapTasksCompleted;
   }
-    
+
+  @Override
   public synchronized void launchReduce(TaskAttemptID taskAttemptID) {
     ++numReduceTasksLaunched;
   }
-    
+
+  @Override
   public synchronized void completeReduce(TaskAttemptID taskAttemptID) {
     ++numReduceTasksCompleted;
   }
-    
+
+  @Override
   public synchronized void submitJob(JobConf conf, JobID id) {
     ++numJobsSubmitted;
   }
-    
+
+  @Override
   public synchronized void completeJob(JobConf conf, JobID id) {
     ++numJobsCompleted;
   }

Modified: hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java?rev=753045&r1=753044&r2=753045&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java (original)
+++ hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java Thu Mar 12 22:50:59 2009
@@ -43,23 +43,27 @@
     metricsRecord.setTag("sessionId", sessionId);
     context.registerUpdater(this);
   }
-    
-  synchronized void completeTask() {
+
+  @Override
+  public synchronized void completeTask(TaskAttemptID t) {
     ++numCompletedTasks;
   }
-  
-  synchronized void timedoutTask() {
+
+  @Override
+  public synchronized void timedoutTask(TaskAttemptID t) {
     ++timedoutTasks;
   }
-  
-  synchronized void taskFailedPing() {
+
+  @Override
+  public synchronized void taskFailedPing(TaskAttemptID t) {
     ++tasksFailedPing;
   }
-  
+
   /**
    * Since this object is a registered updater, this method will be called
    * periodically, e.g. every 5 seconds.
-   */  
+   */
+  @Override
   public void doUpdates(MetricsContext unused) {
     synchronized (this) {
       metricsRecord.setMetric("maps_running", tt.mapTotal);
@@ -79,4 +83,4 @@
   }
 
   
-}
\ No newline at end of file
+}