TEZ-47. Get task max attempts from API or config (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/4beb98f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/4beb98f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/4beb98f3 Branch: refs/heads/master Commit: 4beb98f3158aa2818395c805500c694b9e11c2b2 Parents: b5ebd49 Author: Bikas Saha <[email protected]> Authored: Fri May 24 12:06:05 2013 -0700 Committer: Bikas Saha <[email protected]> Committed: Fri May 24 12:06:34 2013 -0700 ---------------------------------------------------------------------- .../org/apache/tez/dag/api/TezConfiguration.java | 5 +++++ .../tez/dag/app/dag/impl/TaskAttemptImpl.java | 4 +--- .../org/apache/tez/dag/app/dag/impl/TaskImpl.java | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4beb98f3/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java ---------------------------------------------------------------------- diff --git a/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java b/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java index 3018ea1..1dec08a 100644 --- a/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java +++ b/tez-dag-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java @@ -61,6 +61,11 @@ public class TezConfiguration extends Configuration { public static final String DAG_MAX_TASK_FAILURES_PER_NODE = TEZ_PREFIX + "maxtaskfailures.per.node"; public static final int DAG_MAX_TASK_FAILURES_PER_NODE_DEFAULT = 3; + + public static final String DAG_MAX_TASK_ATTEMPTS = + DAG_AM_PREFIX + "max.task.attempts"; + public static final int DAG_MAX_TASK_ATTEMPTS_DEFAULT = 4; + public static final String DAG_NODE_BLACKLISTING_ENABLED = TEZ_PREFIX + "node-blacklisting.enabled"; public static final boolean DAG_NODE_BLACKLISTING_ENABLED_DEFAULT = true; http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4beb98f3/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java index 92ccffe..5d4242d 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java @@ -101,14 +101,13 @@ public class TaskAttemptImpl implements TaskAttempt, EventHandler<TaskAttemptEvent> { // TODO Ensure MAPREDUCE-4457 is factored in. Also MAPREDUCE-4068. - // TODO Consider TAL registartion in the TaskAttempt instead of the container. + // TODO Consider TAL registration in the TaskAttempt instead of the container. private static final Log LOG = LogFactory.getLog(TaskAttemptImpl.class); private static final String LINE_SEPARATOR = System .getProperty("line.separator"); static final TezCounters EMPTY_COUNTERS = new TezCounters(); - private static final long MEMORY_SPLITS_RESOLUTION = 1024; //TODO Make configurable? protected final TezConfiguration conf; protected final int partition; @@ -144,7 +143,6 @@ public class TaskAttemptImpl implements TaskAttempt, protected final String javaOpts; protected final boolean isRescheduled; - private boolean speculatorContainerRequestSent = false; protected String processorName; protected static final FailedTransitionHelper FAILED_HELPER = http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/4beb98f3/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 401f1b0..fb738ce 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 @@ -289,7 +289,8 @@ public class TaskImpl implements Task, EventHandler<TaskEvent> { writeLock = readWriteLock.writeLock(); this.attempts = Collections.emptyMap(); // TODO TEZ-47 get from conf or API - maxAttempts = 4; + maxAttempts = this.conf.getInt(TezConfiguration.DAG_MAX_TASK_ATTEMPTS, + TezConfiguration.DAG_MAX_TASK_ATTEMPTS_DEFAULT); taskId = new TezTaskID(vertexId, partition); this.partition = partition; this.taskAttemptListener = taskAttemptListener;
