You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2016/12/21 18:56:51 UTC

hive git commit: HIVE-15482: LLAP: When pre-emption is disabled task scheduler gets into loop (Prasanth Jayachandran reviewed by Gopal V)

Repository: hive
Updated Branches:
  refs/heads/master cdb56ce03 -> f5af86d6c


HIVE-15482: LLAP: When pre-emption is disabled task scheduler gets into loop (Prasanth Jayachandran reviewed by Gopal V)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f5af86d6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f5af86d6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f5af86d6

Branch: refs/heads/master
Commit: f5af86d6c50b5d00775223f5577ba076b1fc56ed
Parents: cdb56ce
Author: Prasanth Jayachandran <pr...@apache.org>
Authored: Wed Dec 21 10:56:37 2016 -0800
Committer: Prasanth Jayachandran <pr...@apache.org>
Committed: Wed Dec 21 10:56:37 2016 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/f5af86d6/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java
index 7744611..cae2591 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java
@@ -256,7 +256,7 @@ public class TaskExecutorService extends AbstractService implements Scheduler<Ta
                     task.getRequestId(), task.getTaskRunnerCallable().canFinish(),
                     preemptionQueue.size(), numSlotsAvailable.get(), waitQueue.size());
               }
-              if (numSlotsAvailable.get() == 0 && preemptionQueue.isEmpty()) {
+              if (numSlotsAvailable.get() == 0 && (enablePreemption == false || preemptionQueue.isEmpty())) {
                 shouldWait = true;
               }
             } else {