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 7805332..272c745 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 @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; +import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hive.jdbc.miniHS2.MiniHS2; import org.junit.BeforeClass; @@ -46,5 +47,17 @@ public static void beforeTest() throws Exception { String hs2Principal = miniHS2.getConfProperty(ConfVars.HIVE_SERVER2_KERBEROS_PRINCIPAL.varname); String hs2KeyTab = miniHS2.getConfProperty(ConfVars.HIVE_SERVER2_KERBEROS_KEYTAB.varname); System.out.println("HS2 principal : " + hs2Principal + " HS2 keytab : " + hs2KeyTab + " Metastore principal : " + metastorePrincipal); + System.setProperty(HiveConf.ConfVars.METASTOREWAREHOUSE.varname, + MetastoreConf.getVar(hiveConf, MetastoreConf.ConfVars.WAREHOUSE)); + System.setProperty(HiveConf.ConfVars.METASTORECONNECTURLKEY.varname, + MetastoreConf.getVar(hiveConf, MetastoreConf.ConfVars.CONNECT_URL_KEY)); + // Before this patch, the Embedded MetaStore was used here not the one started by the MiniHS2 + // The below 3 lines would change the tests to use the Remote MetaStore, but it will cause a + // failure. By removing the thrift MetaStore uris, the tests are passing again. + // I think this is an valid problem here, but not really sure about the + // tests original intention, so keep everything as it was originally. +// System.setProperty(HiveConf.ConfVars.METASTOREURIS.varname, +// MetastoreConf.getVar(hiveConf, MetastoreConf.ConfVars.THRIFT_URIS)); +// Thread.sleep(2000); } } \ No newline at end of file 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 538be4a..5b7fb7e 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 @@ -20,6 +20,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; +import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.apache.hive.jdbc.miniHS2.MiniHS2; import org.junit.BeforeClass; @@ -46,5 +47,12 @@ public static void beforeTest() throws Exception { String hs2Principal = miniHS2.getConfProperty(ConfVars.HIVE_SERVER2_KERBEROS_PRINCIPAL.varname); String hs2KeyTab = miniHS2.getConfProperty(ConfVars.HIVE_SERVER2_KERBEROS_KEYTAB.varname); System.out.println("HS2 principal : " + hs2Principal + " HS2 keytab : " + hs2KeyTab + " Metastore principal : " + metastorePrincipal); + System.setProperty(HiveConf.ConfVars.METASTOREWAREHOUSE.varname, + MetastoreConf.getVar(hiveConf, MetastoreConf.ConfVars.WAREHOUSE)); + System.setProperty(HiveConf.ConfVars.METASTORECONNECTURLKEY.varname, + MetastoreConf.getVar(hiveConf, MetastoreConf.ConfVars.CONNECT_URL_KEY)); + System.setProperty(HiveConf.ConfVars.METASTOREURIS.varname, + MetastoreConf.getVar(hiveConf, MetastoreConf.ConfVars.THRIFT_URIS)); + Thread.sleep(2000); } } \ No newline at end of file