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 2017/12/01 05:36:26 UTC
hive git commit: HIVE-18188: Fix TestSSL failures in master (Prasanth
Jayachandran reviewed by Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/master 508d7e6f2 -> f68ebdce7
HIVE-18188: Fix TestSSL failures in master (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/f68ebdce
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f68ebdce
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f68ebdce
Branch: refs/heads/master
Commit: f68ebdce7850b748fdbdb4548ce64cbb2d2a47c4
Parents: 508d7e6
Author: Prasanth Jayachandran <pr...@apache.org>
Authored: Thu Nov 30 21:35:54 2017 -0800
Committer: Prasanth Jayachandran <pr...@apache.org>
Committed: Thu Nov 30 21:35:54 2017 -0800
----------------------------------------------------------------------
.../apache/hive/service/server/HiveServer2.java | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/f68ebdce/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 717c4d6..89f7356 100644
--- a/service/src/java/org/apache/hive/service/server/HiveServer2.java
+++ b/service/src/java/org/apache/hive/service/server/HiveServer2.java
@@ -186,26 +186,26 @@ public class HiveServer2 extends CompositeService {
throw new RuntimeException("Failed to get metastore connection", e);
}
- WMFullResourcePlan resourcePlan;
- try {
- resourcePlan = sessionHive.getActiveResourcePlan();
- } catch (HiveException e) {
- throw new RuntimeException(e);
- }
+ String wmQueue = HiveConf.getVar(hiveConf, ConfVars.HIVE_SERVER2_TEZ_INTERACTIVE_QUEUE);
+ if (wmQueue != null && !wmQueue.isEmpty()) {
+ WMFullResourcePlan resourcePlan;
+ try {
+ resourcePlan = sessionHive.getActiveResourcePlan();
+ } catch (HiveException e) {
+ throw new RuntimeException(e);
+ }
- if (resourcePlan == null) {
- if (!HiveConf.getBoolVar(hiveConf, ConfVars.HIVE_IN_TEST)) {
- LOG.error("Cannot activate workload management - no active resource plan");
- } else {
- LOG.info("Creating a default resource plan for test");
- resourcePlan = createTestResourcePlan();
+ if (resourcePlan == null) {
+ if (!HiveConf.getBoolVar(hiveConf, ConfVars.HIVE_IN_TEST)) {
+ LOG.error("Cannot activate workload management - no active resource plan");
+ } else {
+ LOG.info("Creating a default resource plan for test");
+ resourcePlan = createTestResourcePlan();
+ }
}
- }
- if (resourcePlan != null) {
- // Initialize workload management.
- String wmQueue = HiveConf.getVar(hiveConf, ConfVars.HIVE_SERVER2_TEZ_INTERACTIVE_QUEUE);
- if (wmQueue != null && !wmQueue.isEmpty()) {
+ if (resourcePlan != null) {
+ // Initialize workload management.
LOG.info("Initializing workload management");
try {
wm = WorkloadManager.create(wmQueue, hiveConf, resourcePlan);