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 el...@apache.org on 2011/11/18 01:25:49 UTC
svn commit: r1203440 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/test/org/apache/hadoop/mapred/MiniMRCluster.java
src/test/org/apache/hadoop/mapred/TestDiskFailures.java
Author: eli
Date: Fri Nov 18 00:25:49 2011
New Revision: 1203440
URL: http://svn.apache.org/viewvc?rev=1203440&view=rev
Log:
MAPREDUCE-3419. Don't mark exited TT threads as dead in MiniMRCluster. Contributed by Eli Collins
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/TestDiskFailures.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1203440&r1=1203439&r2=1203440&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Nov 18 00:25:49 2011
@@ -68,6 +68,8 @@ Release 0.20.206.0 - unreleased
MAPREDUCE-3394. Add log guard for a debug message in ReduceTask (todd)
+ MAPREDUCE-3419. Don't mark exited TT threads as dead in MiniMRCluster (eli)
+
Release 0.20.205.1 - unreleased
NEW FEATURES
Modified: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/MiniMRCluster.java?rev=1203440&r1=1203439&r2=1203440&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/MiniMRCluster.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/MiniMRCluster.java Fri Nov 18 00:25:49 2011
@@ -146,6 +146,7 @@ public class MiniMRCluster {
String[] localDirs;
volatile boolean isInitialized = false;
volatile boolean isDead = false;
+ volatile boolean exited = false;
int numDir;
TaskTrackerRunner(int trackerId, int numDir, String hostname,
@@ -216,11 +217,11 @@ public class MiniMRCluster {
tt.run();
}
} catch (Throwable e) {
+ isDead = true;
tt = null;
LOG.error("task tracker " + trackerId + " crashed", e);
}
- // TaskTracker finished execution unexpectedly. So marking it as dead.
- isDead = true;
+ exited = true;
}
/**
Modified: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/TestDiskFailures.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/TestDiskFailures.java?rev=1203440&r1=1203439&r2=1203440&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/TestDiskFailures.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/mapred/TestDiskFailures.java Fri Nov 18 00:25:49 2011
@@ -108,7 +108,7 @@ public class TestDiskFailures extends Cl
waitForDiskHealthCheck();
assertTrue(
"Tasktracker is not dead even though all mapred local dirs became bad.",
- cluster.getTaskTrackerRunner(0).isDead);
+ cluster.getTaskTrackerRunner(0).exited);
rb = getMetrics(new TaskTrackerMetricsSource(tt));
assertGauge("failedDirs", 4, rb);
}