[hive] branch master updated: HIVE-22527: Hive on Tez, job that merges small files uses wrong queuename(Zhangbutao via Naveen Gangam)

[ng...@apache.org]

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

ngangam 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 94dca16  HIVE-22527: Hive on Tez, job that merges small files uses wrong queuename(Zhangbutao via Naveen Gangam)
94dca16 is described below

commit 94dca16e4eb3caf7dcaa43ae92807e5750e1ff04
Author: Naveen Gangam <ng...@cloudera.com>
AuthorDate: Mon Mar 2 16:24:46 2020 -0500

    HIVE-22527: Hive on Tez, job that merges small files uses wrong queuename(Zhangbutao via Naveen Gangam)
---
 .../org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
index dea4208..83daf9d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionPoolManager.java
@@ -448,6 +448,12 @@ public class TezSessionPoolManager extends TezSessionPoolSession.AbstractTrigger
       String queueName = session.getQueueName();
       String confQueueName = conf.get(TezConfiguration.TEZ_QUEUE_NAME);
       LOG.info("Current queue name is " + queueName + " incoming queue name is " + confQueueName);
+
+      if (queueName != null && confQueueName == null) {
+        LOG.info("Incoming queue null is reset to current queue " + queueName);
+        confQueueName = queueName;
+      }
+
       return (queueName == null) ? confQueueName == null : queueName.equals(confQueueName);
     } else {
       // this session should never be a default session unless something has messed up.