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 dd...@apache.org on 2008/10/14 15:48:02 UTC
svn commit: r704538 - in /hadoop/core/branches/branch-0.19: CHANGES.txt
src/mapred/org/apache/hadoop/mapred/JobInProgress.java
src/mapred/org/apache/hadoop/mapred/JobTracker.java
src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
Author: ddas
Date: Tue Oct 14 06:48:02 2008
New Revision: 704538
URL: http://svn.apache.org/viewvc?rev=704538&view=rev
Log:
Meerge -r 704535:704536 from trunk onto 0.19 branch. Fixes HADOOP-4361.
Modified:
hadoop/core/branches/branch-0.19/CHANGES.txt
hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java
hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskInProgress.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=704538&r1=704537&r2=704538&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Tue Oct 14 06:48:02 2008
@@ -844,6 +844,10 @@
HADOOP-4287. Fixes an issue to do with maintaining counts of running/pending
maps/reduces. (Sreekanth Ramakrishnan via ddas)
+ HADOOP-4361. Makes sure that jobs killed from command line are killed
+ fast (i.e., there is a slot to run the cleanup task soon).
+ (Amareshwari Sriramadasu via ddas)
+
Release 0.18.2 - Unreleased
BUG FIXES
Modified: hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=704538&r1=704537&r2=704538&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Tue Oct 14 06:48:02 2008
@@ -858,7 +858,7 @@
int clusterSize,
int numUniqueHosts
) throws IOException {
- if (!tasksInited.get()) {
+ if (status.getRunState() != JobStatus.RUNNING) {
LOG.info("Cannot create task split for " + profile.getJobID());
return null;
}
@@ -1016,7 +1016,7 @@
int clusterSize,
int numUniqueHosts
) throws IOException {
- if (!tasksInited.get()) {
+ if (status.getRunState() != JobStatus.RUNNING) {
LOG.info("Cannot create task split for " + profile.getJobID());
return null;
}
@@ -1918,6 +1918,9 @@
//
// kill all TIPs.
//
+ for (int i = 0; i < setup.length; i++) {
+ setup[i].kill();
+ }
for (int i = 0; i < maps.length; i++) {
maps[i].kill();
}
Modified: hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=704538&r1=704537&r2=704538&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java Tue Oct 14 06:48:02 2008
@@ -2054,7 +2054,8 @@
// It may be successfully completed, or may be killed in
// mid-execution.
//
- if (tip.getJob().getStatus().getRunState() == JobStatus.RUNNING) {
+ if (tip.getJob().getStatus().getRunState() == JobStatus.RUNNING ||
+ tip.getJob().getStatus().getRunState() == JobStatus.PREP) {
killList.add(new KillTaskAction(killTaskId));
LOG.debug(taskTracker + " -> KillTaskAction: " + killTaskId);
} else {
@@ -2619,7 +2620,8 @@
(tip.isMapTask() && !tip.isSetupTask() &&
job.desiredReduces() != 0)) {
// if the job is done, we don't want to change anything
- if (job.getStatus().getRunState() == JobStatus.RUNNING) {
+ if (job.getStatus().getRunState() == JobStatus.RUNNING ||
+ job.getStatus().getRunState() == JobStatus.PREP) {
job.failedTask(tip, taskId, ("Lost task tracker: " + trackerName),
(tip.isMapTask() ?
TaskStatus.Phase.MAP :
Modified: hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java?rev=704538&r1=704537&r2=704538&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java (original)
+++ hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java Tue Oct 14 06:48:02 2008
@@ -386,7 +386,9 @@
TaskStatus ts = taskStatuses.get(taskid);
if ((ts != null) &&
(!tasksReportedClosed.contains(taskid)) &&
- (job.getStatus().getRunState() != JobStatus.RUNNING)) {
+ ((this.failed) ||
+ ((job.getStatus().getRunState() != JobStatus.RUNNING &&
+ (job.getStatus().getRunState() != JobStatus.PREP))))) {
tasksReportedClosed.add(taskid);
close = true;
} else if (isComplete() &&