diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 0880a960e6..1e322b86c5 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -574,6 +574,7 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "If not set, defaults to the codec extension for text files (e.g. \".gz\"), or no extension otherwise."), HIVE_IN_TEST("hive.in.test", false, "internal usage only, true in test mode", true), + HIVE_IN_TEST_SSL("hive.in.ssl.test", false, "internal usage only, true in SSL test mode", true), HIVE_IN_TEST_IDE("hive.in.ide.test", false, "internal usage only, true if test running in ide", true), HIVE_TESTING_SHORT_LOGS("hive.testing.short.logs", false, diff --git itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java index 986ccd617d..78a23a24fc 100644 --- itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java +++ itests/hive-unit/src/main/java/org/hadoop/hive/jdbc/SSLTestUtils.java @@ -74,12 +74,14 @@ public static void setHttpConfOverlay(Map confOverlay) { confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_TRANSPORT_MODE.varname, HS2_HTTP_MODE); confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_HTTP_PATH.varname, HS2_HTTP_ENDPOINT); confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_ENABLE_DOAS.varname, "true"); + confOverlay.put(HiveConf.ConfVars.HIVE_IN_TEST_SSL.varname, "true"); } public static void setBinaryConfOverlay(Map confOverlay) { confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_TRANSPORT_MODE.varname, HS2_BINARY_MODE); confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_AUTHENTICATION.varname, HS2_BINARY_AUTH_MODE); confOverlay.put(HiveConf.ConfVars.HIVE_SERVER2_ENABLE_DOAS.varname, "true"); + confOverlay.put(HiveConf.ConfVars.HIVE_IN_TEST_SSL.varname, "true"); } public static void setupTestTableWithData(String tableName, Path dataFilePath, diff --git service/src/java/org/apache/hive/service/server/HiveServer2.java service/src/java/org/apache/hive/service/server/HiveServer2.java index 6c1a0b98cc..86c9c2b33c 100644 --- service/src/java/org/apache/hive/service/server/HiveServer2.java +++ service/src/java/org/apache/hive/service/server/HiveServer2.java @@ -305,8 +305,12 @@ private void initializeWorkloadManagement(HiveConf hiveConf, Hive sessionHive) { WMFullResourcePlan resourcePlan; try { resourcePlan = sessionHive.getActiveResourcePlan(); - } catch (HiveException e) { - throw new RuntimeException(e); + } catch (Throwable e) { + if (!HiveConf.getBoolVar(hiveConf, ConfVars.HIVE_IN_TEST_SSL)) { + throw new RuntimeException(e); + } else { + resourcePlan = null; // Ignore errors in SSL tests where the connection is misconfigured. + } } if (hasQueue && resourcePlan == null && HiveConf.getBoolVar(hiveConf, ConfVars.HIVE_IN_TEST)) {