diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/JdbcWithMiniKdcSQLAuthTest.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/JdbcWithMiniKdcSQLAuthTest.java index 6517a32..8fc0faf 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/JdbcWithMiniKdcSQLAuthTest.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/JdbcWithMiniKdcSQLAuthTest.java @@ -41,13 +41,15 @@ private static MiniHS2 miniHS2 = null; - private static MiniHiveKdc miniHiveKdc = null; + private static MiniHiveKdc miniHiveKdc; private Connection hs2Conn; - protected static HiveConf hiveConf = new HiveConf(); - public static void beforeTestBase() throws Exception { - System.err.println("Testing using HS2 mode:" - + hiveConf.getVar(ConfVars.HIVE_SERVER2_TRANSPORT_MODE)); + public static void beforeTestBase(String transportMode) throws Exception { + miniHiveKdc = new MiniHiveKdc(); + + HiveConf hiveConf = new HiveConf(); + hiveConf.setVar(ConfVars.HIVE_SERVER2_TRANSPORT_MODE, transportMode); + System.err.println("Testing using HS2 mode:" + transportMode); Class.forName(MiniHS2.getJdbcDriverName()); hiveConf.setVar(ConfVars.HIVE_AUTHORIZATION_MANAGER, @@ -58,7 +60,6 @@ public static void beforeTestBase() throws Exception { hiveConf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, false); hiveConf.setBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS, false); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); miniHS2 = MiniHiveKdc.getMiniHS2WithKerb(miniHiveKdc, hiveConf); miniHS2.start(new HashMap()); diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/MiniHiveKdc.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/MiniHiveKdc.java index 8c981eb..7d1192a 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/MiniHiveKdc.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/MiniHiveKdc.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.shims.Utils; import org.apache.hadoop.minikdc.MiniKdc; @@ -55,7 +54,6 @@ private final MiniKdc miniKdc; private final File workDir; - private final Configuration conf; private final Map userPrincipals = new HashMap(); private final Properties kdcConf = MiniKdc.createConf(); @@ -79,16 +77,11 @@ public void cacheGroupsAdd(List groups) throws IOException { } } - public static MiniHiveKdc getMiniHiveKdc (Configuration conf) throws Exception { - return new MiniHiveKdc(conf); - } - - public MiniHiveKdc(Configuration conf) + public MiniHiveKdc() throws Exception { File baseDir = Files.createTempDir(); baseDir.deleteOnExit(); workDir = new File (baseDir, "HiveMiniKdc"); - this.conf = conf; /** * Hadoop security classes read the default realm via static initialization, @@ -107,6 +100,8 @@ public MiniHiveKdc(Configuration conf) addUserPrincipal(HIVE_TEST_USER_1); addUserPrincipal(HIVE_TEST_USER_2); addUserPrincipal(HIVE_TEST_SUPER_USER); + + loginUser(HIVE_TEST_USER_1); } public String getKeyTabFile(String principalName) { diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHiveAuthFactory.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHiveAuthFactory.java index cdc124a..0940c79 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHiveAuthFactory.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHiveAuthFactory.java @@ -33,8 +33,8 @@ @BeforeClass public static void setUp() throws Exception { + miniHiveKdc = new MiniHiveKdc(); hiveConf = new HiveConf(); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); } @AfterClass diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java index ac6452e..bb244a0 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java @@ -55,8 +55,9 @@ public static void setUpBeforeClass() throws Exception { confOverlay.put(ConfVars.SEMANTIC_ANALYZER_HOOK.varname, SemanticAnalysisHook.class.getName()); confOverlay.put(ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "" + Boolean.FALSE); + + miniHiveKdc = new MiniHiveKdc(); HiveConf hiveConf = new HiveConf(); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); miniHS2 = MiniHiveKdc.getMiniHS2WithKerb(miniHiveKdc, hiveConf); miniHS2.start(confOverlay); } diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcNonKrbSASLWithMiniKdc.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcNonKrbSASLWithMiniKdc.java index fd89b30..2ef6c87 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcNonKrbSASLWithMiniKdc.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcNonKrbSASLWithMiniKdc.java @@ -57,8 +57,8 @@ public static void beforeTest() throws Exception { SessionHookTest.class.getName()); confOverlay.put(ConfVars.HIVE_SERVER2_CUSTOM_AUTHENTICATION_CLASS.varname, CustomAuthenticator.class.getName()); + miniHiveKdc = new MiniHiveKdc(); HiveConf hiveConf = new HiveConf(); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); miniHS2 = MiniHiveKdc.getMiniHS2WithKerbWithRemoteHMS(miniHiveKdc, hiveConf, "CUSTOM"); miniHS2.start(confOverlay); } diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithDBTokenStore.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithDBTokenStore.java index e2e37bf..7805332 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithDBTokenStore.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithDBTokenStore.java @@ -36,10 +36,10 @@ public static void beforeTest() throws Exception { confOverlay.put(ConfVars.HIVE_SERVER2_SESSION_HOOK.varname, SessionHookTest.class.getName()); + miniHiveKdc = new MiniHiveKdc(); HiveConf hiveConf = new HiveConf(); //using old config value tests backwards compatibility hiveConf.setVar(ConfVars.METASTORE_CLUSTER_DELEGATION_TOKEN_STORE_CLS, "org.apache.hadoop.hive.thrift.DBTokenStore"); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); miniHS2 = MiniHiveKdc.getMiniHS2WithKerbWithRemoteHMSWithKerb(miniHiveKdc, hiveConf); miniHS2.start(confOverlay); String metastorePrincipal = miniHS2.getConfProperty(ConfVars.METASTORE_KERBEROS_PRINCIPAL.varname); diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithDBTokenStoreNoDoAs.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithDBTokenStoreNoDoAs.java index c4021d7..538be4a 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithDBTokenStoreNoDoAs.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithDBTokenStoreNoDoAs.java @@ -36,10 +36,10 @@ public static void beforeTest() throws Exception { confOverlay.put(ConfVars.HIVE_SERVER2_SESSION_HOOK.varname, SessionHookTest.class.getName()); + miniHiveKdc = new MiniHiveKdc(); HiveConf hiveConf = new HiveConf(); hiveConf.setVar(ConfVars.METASTORE_CLUSTER_DELEGATION_TOKEN_STORE_CLS, "org.apache.hadoop.hive.thrift.DBTokenStore"); hiveConf.setBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS, false); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); miniHS2 = MiniHiveKdc.getMiniHS2WithKerbWithRemoteHMS(miniHiveKdc, hiveConf); miniHS2.start(confOverlay); String metastorePrincipal = miniHS2.getConfProperty(ConfVars.METASTORE_KERBEROS_PRINCIPAL.varname); diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdc.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdc.java index f3e886e..e526b48 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdc.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdc.java @@ -69,8 +69,8 @@ public static void beforeTest() throws Exception { confOverlay.put(ConfVars.HIVE_SERVER2_SESSION_HOOK.varname, SessionHookTest.class.getName()); + miniHiveKdc = new MiniHiveKdc(); HiveConf hiveConf = new HiveConf(); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); miniHS2 = MiniHiveKdc.getMiniHS2WithKerb(miniHiveKdc, hiveConf); miniHS2.start(confOverlay); } diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcCookie.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcCookie.java index 5e70d68..9cad3ea 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcCookie.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcCookie.java @@ -42,11 +42,13 @@ private static MiniHiveKdc miniHiveKdc = null; private Connection hs2Conn; File dataFile; - protected static HiveConf hiveConf = new HiveConf(); + protected static HiveConf hiveConf; private static String HIVE_NON_EXISTENT_USER = "hive_no_exist"; @BeforeClass public static void beforeTest() throws Exception { + miniHiveKdc = new MiniHiveKdc(); + hiveConf = new HiveConf(); hiveConf.setVar(ConfVars.HIVE_SERVER2_TRANSPORT_MODE, MiniHS2.HS2_HTTP_MODE); System.err.println("Testing using HS2 mode : " + hiveConf.getVar(ConfVars.HIVE_SERVER2_TRANSPORT_MODE)); @@ -56,7 +58,6 @@ public static void beforeTest() throws Exception { hiveConf.setTimeVar(ConfVars.HIVE_SERVER2_THRIFT_HTTP_COOKIE_MAX_AGE, 1, TimeUnit.SECONDS); hiveConf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, false); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); miniHS2 = MiniHiveKdc.getMiniHS2WithKerb(miniHiveKdc, hiveConf); miniHS2.start(new HashMap()); } diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcSQLAuthBinary.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcSQLAuthBinary.java index dd3ffe9..bb84c88 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcSQLAuthBinary.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcSQLAuthBinary.java @@ -18,7 +18,6 @@ package org.apache.hive.minikdc; -import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hive.jdbc.miniHS2.MiniHS2; import org.junit.BeforeClass; @@ -26,8 +25,7 @@ @BeforeClass public static void beforeTest() throws Exception { - hiveConf.setVar(ConfVars.HIVE_SERVER2_TRANSPORT_MODE, MiniHS2.HS2_HTTP_MODE); - JdbcWithMiniKdcSQLAuthTest.beforeTestBase(); + JdbcWithMiniKdcSQLAuthTest.beforeTestBase(MiniHS2.HS2_BINARY_MODE); } diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcSQLAuthHttp.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcSQLAuthHttp.java index 09ddcd0..fee3fcb 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcSQLAuthHttp.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestJdbcWithMiniKdcSQLAuthHttp.java @@ -18,7 +18,6 @@ package org.apache.hive.minikdc; -import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hive.jdbc.miniHS2.MiniHS2; import org.junit.BeforeClass; @@ -26,8 +25,7 @@ @BeforeClass public static void beforeTest() throws Exception { - hiveConf.setVar(ConfVars.HIVE_SERVER2_TRANSPORT_MODE, MiniHS2.HS2_HTTP_MODE); - JdbcWithMiniKdcSQLAuthTest.beforeTestBase(); + JdbcWithMiniKdcSQLAuthTest.beforeTestBase(MiniHS2.HS2_HTTP_MODE); } diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestMiniHiveKdc.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestMiniHiveKdc.java index e169c93..e58786b 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestMiniHiveKdc.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestMiniHiveKdc.java @@ -47,8 +47,8 @@ public static void beforeTest() throws Exception { @Before public void setUp() throws Exception { + miniHiveKdc = new MiniHiveKdc(); hiveConf = new HiveConf(); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); } @After diff --git itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestSSLWithMiniKdc.java itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestSSLWithMiniKdc.java index 3153b9f..72bad5e 100644 --- itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestSSLWithMiniKdc.java +++ itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestSSLWithMiniKdc.java @@ -44,13 +44,13 @@ public static void beforeTest() throws Exception { Class.forName(MiniHS2.getJdbcDriverName()); + miniHiveKdc = new MiniHiveKdc(); + HiveConf hiveConf = new HiveConf(); SSLTestUtils.setMetastoreSslConf(hiveConf); hiveConf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, false); - miniHiveKdc = MiniHiveKdc.getMiniHiveKdc(hiveConf); - setHMSSaslConf(miniHiveKdc, hiveConf); miniHS2 = MiniHiveKdc.getMiniHS2WithKerbWithRemoteHMS(miniHiveKdc, hiveConf);