[hive] branch master updated: HIVE-23595: Do not query task guaranteed status when wlm off (Mustafa Iman via Gopal Vijayaraghavan)

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 2795d32  HIVE-23595: Do not query task guaranteed status when wlm off (Mustafa Iman via Gopal Vijayaraghavan)
2795d32 is described below

commit 2795d3253f5ff09c23b12e5ff980cb14268d37ab
Author: Mustafa Iman <mu...@gmail.com>
AuthorDate: Wed Jun 3 18:55:19 2020 +0200

    HIVE-23595: Do not query task guaranteed status when wlm off (Mustafa Iman via Gopal Vijayaraghavan)
    
    Signed-off-by: Laszlo Bodor <bo...@gmail.com>
---
 .../hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 9cb8bc9..4e5e43c 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
@@ -223,6 +223,7 @@ public class LlapTaskSchedulerService extends TaskScheduler {
       speculativeTasks = new TreeMap<>();
 
   private final LlapPluginServerImpl pluginEndpoint;
+  private final boolean workloadManagementEnabled;
 
   // Queue for disabled nodes. Nodes make it out of this queue when their expiration timeout is hit.
   @VisibleForTesting
@@ -450,6 +451,8 @@ public class LlapTaskSchedulerService extends TaskScheduler {
         + "nodeBlacklistConf={}, localityConf={} consistentSplits={}",
         hostsString, numSchedulableTasksPerNode, nodeBlacklistConf, localityDelayConf, consistentSplits);
     this.amRegistry = TezAmRegistryImpl.create(conf, true);
+    this.workloadManagementEnabled =
+        !StringUtils.isEmpty(conf.get(ConfVars.HIVE_SERVER2_TEZ_INTERACTIVE_QUEUE.varname, "").trim());
 
     synchronized (LlapTaskCommunicator.pluginInitLock) {
       LlapTaskCommunicator peer = LlapTaskCommunicator.instance;
@@ -1089,7 +1092,7 @@ public class LlapTaskSchedulerService extends TaskScheduler {
     } finally {
       writeLock.unlock();
     }
-    if (!StringUtils.isEmpty(conf.get(ConfVars.HIVE_SERVER2_TEZ_INTERACTIVE_QUEUE.varname, "").trim())) {
+    if (workloadManagementEnabled) {
       updateGuaranteedInRegistry(tgVersionForZk, 0);
     }
     // TODO Cleanup pending tasks etc, so that the next dag is not affected.
@@ -1338,6 +1341,9 @@ public class LlapTaskSchedulerService extends TaskScheduler {
    * @return The initial value of the guaranteed flag to send with the task.
    */
   boolean isInitialGuaranteed(TezTaskAttemptID attemptId) {
+    if (!workloadManagementEnabled) {
+      return false;
+    }
     TaskInfo info = null;
     readLock.lock();
     try {