Repository: hive Updated Branches: refs/heads/master 15dd29451 -> 12818520e
HIVE-18458: Workload manager initializes even when interactive queue is not set (Prasanth Jayachandran reviewed by Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/12818520 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/12818520 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/12818520 Branch: refs/heads/master Commit: 12818520e65c40d7b451918c59be52e61b8dc3cc Parents: 15dd294 Author: Prasanth Jayachandran <[email protected]> Authored: Mon Jan 22 11:35:07 2018 -0800 Committer: Prasanth Jayachandran <[email protected]> Committed: Mon Jan 22 11:35:07 2018 -0800 ---------------------------------------------------------------------- .../org/apache/hive/service/server/HiveServer2.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/12818520/service/src/java/org/apache/hive/service/server/HiveServer2.java ---------------------------------------------------------------------- diff --git a/service/src/java/org/apache/hive/service/server/HiveServer2.java b/service/src/java/org/apache/hive/service/server/HiveServer2.java index caa5f84..2a528cd 100644 --- a/service/src/java/org/apache/hive/service/server/HiveServer2.java +++ b/service/src/java/org/apache/hive/service/server/HiveServer2.java @@ -287,12 +287,14 @@ public class HiveServer2 extends CompositeService { LOG.warn("Workload management is enabled but there's no resource plan"); } - // Initialize workload management. - LOG.info("Initializing workload management"); - try { - wm = WorkloadManager.create(wmQueue, hiveConf, resourcePlan); - } catch (ExecutionException | InterruptedException e) { - throw new ServiceException("Unable to instantiate Workload Manager", e); + if (hasQueue) { + // Initialize workload management. + LOG.info("Initializing workload management"); + try { + wm = WorkloadManager.create(wmQueue, hiveConf, resourcePlan); + } catch (ExecutionException | InterruptedException e) { + throw new ServiceException("Unable to instantiate Workload Manager", e); + } } if (resourcePlan != null) {
