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 void run() { 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 {