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 7c0a1fe120..f0ca514a24 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 @@ private static boolean canWorkWithSameSession(TezSessionState session, HiveConf 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 " + confQueueName + " 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.