Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9C0DC17385 for ; Tue, 7 Apr 2015 20:12:20 +0000 (UTC) Received: (qmail 87690 invoked by uid 500); 7 Apr 2015 20:12:20 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 87627 invoked by uid 500); 7 Apr 2015 20:12:20 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 86423 invoked by uid 99); 7 Apr 2015 20:12:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Apr 2015 20:12:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1985E1844; Tue, 7 Apr 2015 20:12:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sseth@apache.org To: commits@tez.apache.org Date: Tue, 07 Apr 2015 20:12:50 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/35] tez git commit: TEZ-2175. Task priority should be available to the TaskCommunicator plugin. (sseth) 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/f0a7567f Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/f0a7567f Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/f0a7567f Branch: refs/heads/TEZ-2003 Commit: f0a7567f1cb48023ffcd02d3ebf0f8f948aeaa7b Parents: 5d48b4b Author: Siddharth Seth Authored: Tue Mar 10 00:47:07 2015 -0700 Committer: Siddharth Seth Committed: Tue Apr 7 13:11:45 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/f0a7567f/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/f0a7567f/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 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/f0a7567f/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/f0a7567f/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 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/f0a7567f/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 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);