Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8158E200C2A for ; Wed, 1 Mar 2017 18:11:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7FEAC160B70; Wed, 1 Mar 2017 17:11:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C6B94160B56 for ; Wed, 1 Mar 2017 18:11:18 +0100 (CET) Received: (qmail 85114 invoked by uid 500); 1 Mar 2017 17:11:18 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 85103 invoked by uid 99); 1 Mar 2017 17:11:17 -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; Wed, 01 Mar 2017 17:11:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BACCDDFDE6; Wed, 1 Mar 2017 17:11:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sseth@apache.org To: commits@hive.apache.org Message-Id: <99d89726392346389e5c7111b089faf2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-16067. LLAP: send out container complete messages after a fragment completes. (Siddharth Seth, reviewed by Sergey Shelukhin) Date: Wed, 1 Mar 2017 17:11:17 +0000 (UTC) archived-at: Wed, 01 Mar 2017 17:11:19 -0000 Repository: hive Updated Branches: refs/heads/master bc88d53a2 -> ba5397a78 HIVE-16067. LLAP: send out container complete messages after a fragment completes. (Siddharth Seth, reviewed by Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ba5397a7 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ba5397a7 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ba5397a7 Branch: refs/heads/master Commit: ba5397a7819ca0388c147cd1ab53c4d102b35132 Parents: bc88d53 Author: Siddharth Seth Authored: Wed Mar 1 09:10:47 2017 -0800 Committer: Siddharth Seth Committed: Wed Mar 1 09:10:47 2017 -0800 ---------------------------------------------------------------------- .../hive/llap/tezplugins/LlapContainerLauncher.java | 14 ++++++++++---- .../llap/tezplugins/LlapTaskSchedulerService.java | 9 ++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ba5397a7/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java ---------------------------------------------------------------------- diff --git a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java index 07703a2..9e928e6 100644 --- a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java +++ b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java @@ -30,14 +30,20 @@ public class LlapContainerLauncher extends ContainerLauncher { @Override public void launchContainer(ContainerLaunchRequest containerLaunchRequest) { - LOG.info("No-op launch for container: " + containerLaunchRequest.getContainerId() + - " succeeded on host: " + containerLaunchRequest.getNodeId()); + if (LOG.isDebugEnabled()) { + LOG.debug("No-op launch for container: " + + containerLaunchRequest.getContainerId() + + " succeeded on host: " + containerLaunchRequest.getNodeId()); + } getContext().containerLaunched(containerLaunchRequest.getContainerId()); } @Override public void stopContainer(ContainerStopRequest containerStopRequest) { - LOG.info("DEBUG: Ignoring STOP_REQUEST for event: " + containerStopRequest); - getContext().containerStopRequested(containerStopRequest.getContainerId()); + if (LOG.isDebugEnabled()) { + LOG.debug("No-op stopContainer invocation for containerId={}", + containerStopRequest.getContainerId()); + } + // Nothing to do here. } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hive/blob/ba5397a7/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java ---------------------------------------------------------------------- diff --git a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java index fe73ff1..cfcf0f0 100644 --- a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java +++ b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java @@ -72,6 +72,8 @@ import org.apache.hadoop.hive.llap.tezplugins.scheduler.LoggingFutureCallback; import org.apache.hadoop.hive.llap.tezplugins.metrics.LlapTaskSchedulerMetrics; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; +import org.apache.hadoop.yarn.api.records.ContainerState; +import org.apache.hadoop.yarn.api.records.ContainerStatus; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeReport; import org.apache.hadoop.yarn.api.records.NodeState; @@ -703,12 +705,17 @@ public class LlapTaskSchedulerService extends TaskScheduler { writeLock.unlock(); } getContext().containerBeingReleased(taskInfo.containerId); + getContext().containerCompleted(taskInfo.task, ContainerStatus.newInstance(taskInfo.containerId, + ContainerState.COMPLETE, "", 0)); return true; } @Override public Object deallocateContainer(ContainerId containerId) { - LOG.debug("Ignoring deallocateContainer for containerId: " + containerId); + if (LOG.isDebugEnabled()) { + LOG.debug("Ignoring deallocateContainer for containerId: {}", + containerId); + } // Containers are not being tracked for re-use. // This is safe to ignore since a deallocate task will come in. return null;