You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2014/04/08 02:37:52 UTC
git commit: TEZ-1025. Rename tez.am.max.task.attempts to
tez.am.task.max.failed.attempts (bikas)
Repository: incubator-tez
Updated Branches:
refs/heads/master b555939a7 -> de4cbd6c6
TEZ-1025. Rename tez.am.max.task.attempts to tez.am.task.max.failed.attempts (bikas)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/de4cbd6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/de4cbd6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/de4cbd6c
Branch: refs/heads/master
Commit: de4cbd6c6f98789c5831f9888dcd4901fc25399a
Parents: b555939
Author: Bikas Saha <bi...@apache.org>
Authored: Mon Apr 7 17:37:42 2014 -0700
Committer: Bikas Saha <bi...@apache.org>
Committed: Mon Apr 7 17:37:42 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/tez/dag/api/TezConfiguration.java | 10 +++++++---
.../apache/tez/dag/app/dag/impl/TaskImpl.java | 20 ++++++++++----------
.../org/apache/tez/test/TestFaultTolerance.java | 2 +-
4 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de4cbd6c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2155409..ac79072 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.5.0-incubating: Unreleased
INCOMPATIBLE CHANGES
TEZ-960. VertexManagerPluginContext::getTotalAVailableResource() changed to
VertexManagerPluginContext::getTotalAvailableResource()
+ TEZ-1025. Rename tez.am.max.task.attempts to tez.am.task.max.failed.attempts
Release 0.4.0-incubating: 2014-04-05
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de4cbd6c/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
index 63b0335..2e027c0 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
@@ -110,9 +110,13 @@ public class TezConfiguration extends Configuration {
"max.app.attempts";
public static int TEZ_AM_MAX_APP_ATTEMPTS_DEFAULT = 2;
- public static final String TEZ_AM_MAX_TASK_ATTEMPTS =
- TEZ_AM_PREFIX + "max.task.attempts";
- public static final int TEZ_AM_MAX_TASK_ATTEMPTS_DEFAULT = 4;
+ /**
+ * The maximum number of attempts that can fail for a particular task. This
+ * does not count killed attempts.
+ */
+ public static final String TEZ_AM_TASK_MAX_FAILED_ATTEMPTS =
+ TEZ_AM_PREFIX + "task.max.failed.attempts";
+ public static final int TEZ_AM_TASK_MAX_FAILED_ATTEMPTS_DEFAULT = 4;
public static final String TEZ_AM_NODE_BLACKLISTING_ENABLED = TEZ_AM_PREFIX
+ "node-blacklisting.enabled";
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de4cbd6c/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
index c06509b..4490103 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
@@ -108,7 +108,7 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> {
protected final EventHandler eventHandler;
private final TezTaskID taskId;
private Map<TezTaskAttemptID, TaskAttempt> attempts;
- private final int maxAttempts;
+ private final int maxFailedAttempts;
protected final Clock clock;
private final Lock readLock;
private final Lock writeLock;
@@ -340,8 +340,8 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> {
writeLock = readWriteLock.writeLock();
this.attempts = Collections.emptyMap();
// TODO Avoid reading this from configuration for each task.
- maxAttempts = this.conf.getInt(TezConfiguration.TEZ_AM_MAX_TASK_ATTEMPTS,
- TezConfiguration.TEZ_AM_MAX_TASK_ATTEMPTS_DEFAULT);
+ maxFailedAttempts = this.conf.getInt(TezConfiguration.TEZ_AM_TASK_MAX_FAILED_ATTEMPTS,
+ TezConfiguration.TEZ_AM_TASK_MAX_FAILED_ATTEMPTS_DEFAULT);
taskId = TezTaskID.getInstance(vertexId, taskIndex);
this.taskAttemptListener = taskAttemptListener;
this.taskHeartbeatHandler = thh;
@@ -788,7 +788,7 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> {
case 1:
Map<TezTaskAttemptID, TaskAttempt> newAttempts
- = new LinkedHashMap<TezTaskAttemptID, TaskAttempt>(maxAttempts);
+ = new LinkedHashMap<TezTaskAttemptID, TaskAttempt>(maxFailedAttempts);
newAttempts.putAll(attempts);
attempts = newAttempts;
attempts.put(attempt.getID(), attempt);
@@ -1173,7 +1173,7 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> {
}
if (endState != TaskStateInternal.SUCCEEDED &&
- task.attempts.size() >= task.maxAttempts) {
+ task.attempts.size() >= task.maxFailedAttempts) {
// Exceeded max attempts
task.finished(TaskStateInternal.FAILED);
endState = TaskStateInternal.FAILED;
@@ -1260,7 +1260,7 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> {
// The attempt would have informed the scheduler about it's failure
task.finishedAttempts++;
- if (task.failedAttempts < task.maxAttempts) {
+ if (task.failedAttempts < task.maxFailedAttempts) {
task.handleTaskAttemptCompletion(
((TaskEventTAUpdate) event).getTaskAttemptID(),
TaskAttemptStateInternal.FAILED);
@@ -1268,14 +1268,14 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> {
if (--task.numberUncompletedAttempts == 0
&& task.successfulAttempt == null) {
LOG.info("Scheduling new attempt for task: " + task.getTaskId()
- + ", currentFailedAttempts: " + task.failedAttempts + ", maxAttempts: "
- + task.maxAttempts);
+ + ", currentFailedAttempts: " + task.failedAttempts + ", maxFailedAttempts: "
+ + task.maxFailedAttempts);
task.addAndScheduleAttempt();
}
} else {
LOG.info("Failing task: " + task.getTaskId()
- + ", currentFailedAttempts: " + task.failedAttempts + ", maxAttempts: "
- + task.maxAttempts);
+ + ", currentFailedAttempts: " + task.failedAttempts + ", maxFailedAttempts: "
+ + task.maxFailedAttempts);
task.handleTaskAttemptCompletion(
((TaskEventTAUpdate) event).getTaskAttemptID(),
TaskAttemptStateInternal.FAILED);
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/de4cbd6c/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java b/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java
index 10f273f..e9018d5 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestFaultTolerance.java
@@ -359,7 +359,7 @@ public class TestFaultTolerance {
public void testThreeLevelsFailingDAG2VerticesHaveFailedAttemptsDAGSucceeds() throws Exception {
Configuration testConf = new Configuration();
//set maximum number of task attempts to 4
- testConf.setInt(TezConfiguration.TEZ_AM_MAX_TASK_ATTEMPTS, 4);
+ testConf.setInt(TezConfiguration.TEZ_AM_TASK_MAX_FAILED_ATTEMPTS, 4);
//l2v1 failure
testConf.setBoolean(TestProcessor.getVertexConfName(
TestProcessor.TEZ_FAILING_PROCESSOR_DO_FAIL, "l2v1"), true);