Author: cdouglas
Date: Wed Mar 25 19:57:41 2009
New Revision: 758423
URL: http://svn.apache.org/viewvc?rev=758423&view=rev
Log:
HADOOP-5565. Add API for failing/finalized jobs to the JT metrics
instrumentation. Contributed by Jerome Boulon
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTrackerInstrumentation.java
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=758423&r1=758422&r2=758423&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Wed Mar 25 19:57:41 2009
@@ -799,6 +799,9 @@
HADOOP-5564. Limit the JVM heap size in the java command for initializing
JAVA_PLATFORM. (Suresh Srinivas via szetszwo)
+ HADOOP-5565. Add API for failing/finalized jobs to the JT metrics
+ instrumentation. (Jerome Boulon via cdouglas)
+
Release 0.19.2 - Unreleased
BUG FIXES
Modified:
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=758423&r1=758422&r2=758423&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
(original)
+++
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
Wed Mar 25 19:57:41 2009
@@ -2114,6 +2114,7 @@
}
private synchronized void terminateJob(int jobTerminationState) {
+ final JobTrackerInstrumentation metrics = jobtracker.getInstrumentation();
if ((status.getRunState() == JobStatus.RUNNING) ||
(status.getRunState() == JobStatus.PREP)) {
if (jobTerminationState == JobStatus.FAILED) {
@@ -2134,6 +2135,7 @@
this.finishedReduceTasks);
}
garbageCollect();
+ metrics.terminateJob(this.conf, this.status.getJobID());
}
}
Modified:
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=758423&r1=758422&r2=758423&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
(original)
+++
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Wed Mar 25 19:57:41 2009
@@ -1894,6 +1894,9 @@
LOG.info("Failed to finalize the log file recovery for job " + id, ioe);
}
+ final JobTrackerInstrumentation metrics = getInstrumentation();
+ metrics.finalizeJob(conf, id);
+
long now = System.currentTimeMillis();
// mark the job for cleanup at all the trackers
Modified:
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTrackerInstrumentation.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTrackerInstrumentation.java?rev=758423&r1=758422&r2=758423&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTrackerInstrumentation.java
(original)
+++
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTrackerInstrumentation.java
Wed Mar 25 19:57:41 2009
@@ -49,6 +49,12 @@
public void completeJob(JobConf conf, JobID id)
{ }
+ public void terminateJob(JobConf conf, JobID id)
+ { }
+
+ public void finalizeJob(JobConf conf, JobID id)
+ { }
+
public void addWaiting(JobID id, int tasks)
{ }
