diff --git llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java index 07703a2..9e928e6 100644 --- llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java +++ llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapContainerLauncher.java @@ -30,14 +30,20 @@ public LlapContainerLauncher(ContainerLauncherContext containerLauncherContext) @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 diff --git llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java index fe73ff1..cfcf0f0 100644 --- llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java +++ llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java @@ -72,6 +72,8 @@ 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 boolean deallocateTask(Object task, boolean taskSucceeded, TaskAttemptEnd 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;