Browse Source

HADOOP-934. Fix TaskTracker to catch metrics exceptions that were causing heartbeats to fail.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@501946 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 years ago
parent
commit
dccf6c9b80
2 changed files with 9 additions and 1 deletions
  1. 3 0
      CHANGES.txt
  2. 6 1
      src/java/org/apache/hadoop/mapred/TaskTracker.java

+ 3 - 0
CHANGES.txt

@@ -108,6 +108,9 @@ Trunk (unreleased changes)
 33. HADOOP-959.  Fix namenode snapshot code added in HADOOP-227 to
     work on Windows.  (Dhruba Borthakur via cutting)
 
+34. HADOOP-934.  Fix TaskTracker to catch metrics exceptions that were
+    causing heartbeats to fail.  (Arun Murthy via cutting)
+
 
 Release 0.10.1 - 2007-01-10
 

+ 6 - 1
src/java/org/apache/hadoop/mapred/TaskTracker.java

@@ -22,6 +22,7 @@ import org.apache.commons.logging.*;
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.ipc.*;
 import org.apache.hadoop.metrics.Metrics;
+import org.apache.hadoop.metrics.MetricsException;
 import org.apache.hadoop.util.*;
 import org.apache.hadoop.util.DiskChecker.DiskErrorException;
 
@@ -601,7 +602,11 @@ public class TaskTracker
             } else {
               reduceTotal--;
             }
-            myMetrics.completeTask();
+            try {
+              myMetrics.completeTask();
+            } catch (MetricsException me) {
+              LOG.warn("Caught: " + StringUtils.stringifyException(me));
+            }
             runningTasks.remove(taskStatus.getTaskId());
           }
         }