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 2015/05/20 04:37:46 UTC
hive git commit: Revert "HIVE-10764: LLAP: Wait queue scheduler goes
into tight loop (Prasanth Jayachandran)"
Repository: hive
Updated Branches:
refs/heads/llap f0dd95628 -> 97fa2202f
Revert "HIVE-10764: LLAP: Wait queue scheduler goes into tight loop (Prasanth Jayachandran)"
This reverts commit f0dd95628c8c8c3598f5c9f4f16b8c7e70ada107.
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/97fa2202
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/97fa2202
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/97fa2202
Branch: refs/heads/llap
Commit: 97fa2202ff37d59c6d06c1a2723a2f4d981f6749
Parents: f0dd956
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Tue May 19 19:37:33 2015 -0700
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Tue May 19 19:37:33 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java | 2 +-
.../hadoop/hive/llap/daemon/impl/TestTaskExecutorService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/97fa2202/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 09c8c39..599c759 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
@@ -135,7 +135,7 @@ public class TaskExecutorService implements Scheduler<TaskRunnerCallable> {
// TODO: Event notifications that change canFinish state should notify waitLock
synchronized (waitLock) {
// KKK Is this a tight loop when there's only finishable tasks available ?
- if (!task.canFinish() || numSlotsAvailable.get() == 0) {
+ if (!task.canFinish() && numSlotsAvailable.get() == 0) {
waitLock.wait();
// Another task at a higher priority may have come in during the wait. Lookup the
// queue again to pick up the task at the highest priority.
http://git-wip-us.apache.org/repos/asf/hive/blob/97fa2202/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestTaskExecutorService.java
----------------------------------------------------------------------
diff --git a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestTaskExecutorService.java b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestTaskExecutorService.java
index e387ce4..f0e53a7 100644
--- a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestTaskExecutorService.java
+++ b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestTaskExecutorService.java
@@ -60,7 +60,7 @@ public class TestTaskExecutorService {
@Override
protected TaskRunner2Result callInternal() {
- System.out.println(super.toString() + " is executing..");
+ System.out.println(requestId + " is executing..");
try {
Thread.sleep(workTime);
} catch (InterruptedException e) {