TEZ-2175. Task priority should be available to the TaskCommunicator plugin. (sseth)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/5f2cb40a Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/5f2cb40a Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/5f2cb40a Branch: refs/heads/TEZ-2003 Commit: 5f2cb40a87910299fa6f4cc806fccc77d616242a Parents: 7bfa972 Author: Siddharth Seth <[email protected]> Authored: Tue Mar 10 00:47:07 2015 -0700 Committer: Siddharth Seth <[email protected]> Committed: Thu Apr 9 13:32:32 2015 -0700 ---------------------------------------------------------------------- TEZ-2003-CHANGES.txt | 1 + .../src/main/java/org/apache/tez/dag/api/TaskCommunicator.java | 2 +- .../org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java | 2 +- .../java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java | 3 ++- .../dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java | 5 +++-- 5 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/5f2cb40a/TEZ-2003-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-2003-CHANGES.txt b/TEZ-2003-CHANGES.txt index 5c5fd8e..7726815 100644 --- a/TEZ-2003-CHANGES.txt +++ b/TEZ-2003-CHANGES.txt @@ -9,5 +9,6 @@ ALL CHANGES: TEZ-2131. Add additional tests for tasks running in the AM. TEZ-2138. Fix minor bugs in adding default scheduler, getting launchers. TEZ-2139. Update tez version to 0.7.0-TEZ-2003-SNAPSHOT. + TEZ-2175. Task priority should be available to the TaskCommunicator plugin. INCOMPATIBLE CHANGES: http://git-wip-us.apache.org/repos/asf/tez/blob/5f2cb40a/tez-dag/src/main/java/org/apache/tez/dag/api/TaskCommunicator.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/api/TaskCommunicator.java b/tez-dag/src/main/java/org/apache/tez/dag/api/TaskCommunicator.java index c9f85e0..82eed20 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/api/TaskCommunicator.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/api/TaskCommunicator.java @@ -43,7 +43,7 @@ public abstract class TaskCommunicator extends AbstractService { public abstract void registerRunningTaskAttempt(ContainerId containerId, TaskSpec taskSpec, Map<String, LocalResource> additionalResources, Credentials credentials, - boolean credentialsChanged); + boolean credentialsChanged, int priority); // TODO TEZ-2003 Remove reference to TaskAttemptID public abstract void unregisterRunningTaskAttempt(TezTaskAttemptID taskAttemptID); http://git-wip-us.apache.org/repos/asf/tez/blob/5f2cb40a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java index a3a569f..7973775 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java @@ -321,7 +321,7 @@ public class TaskAttemptListenerImpTezDag extends AbstractService implements } taskCommunicators[taskCommId].registerRunningTaskAttempt(containerId, amContainerTask.getTask(), amContainerTask.getAdditionalResources(), amContainerTask.getCredentials(), - amContainerTask.haveCredentialsChanged()); + amContainerTask.haveCredentialsChanged(), amContainerTask.getPriority()); } @Override http://git-wip-us.apache.org/repos/asf/tez/blob/5f2cb40a/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java index 0bf1b5d..f288748 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/TezTaskCommunicatorImpl.java @@ -194,7 +194,8 @@ public class TezTaskCommunicatorImpl extends TaskCommunicator { @Override public void registerRunningTaskAttempt(ContainerId containerId, TaskSpec taskSpec, Map<String, LocalResource> additionalResources, - Credentials credentials, boolean credentialsChanged) { + Credentials credentials, boolean credentialsChanged, + int priority) { ContainerInfo containerInfo = registeredContainers.get(containerId); Preconditions.checkNotNull(containerInfo, http://git-wip-us.apache.org/repos/asf/tez/blob/5f2cb40a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java ---------------------------------------------------------------------- diff --git a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java index 78cdcde..a327caf 100644 --- a/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java +++ b/tez-ext-service-tests/src/test/java/org/apache/tez/dag/app/taskcomm/TezTestServiceTaskCommunicatorImpl.java @@ -100,9 +100,10 @@ public class TezTestServiceTaskCommunicatorImpl extends TezTaskCommunicatorImpl public void registerRunningTaskAttempt(final ContainerId containerId, final TaskSpec taskSpec, Map<String, LocalResource> additionalResources, Credentials credentials, - boolean credentialsChanged) { + boolean credentialsChanged, + int priority) { super.registerRunningTaskAttempt(containerId, taskSpec, additionalResources, credentials, - credentialsChanged); + credentialsChanged, priority); SubmitWorkRequestProto requestProto = null; try { requestProto = constructSubmitWorkRequest(containerId, taskSpec);
