diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index 844e07c..27077b4 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -525,24 +525,6 @@ private void createDefaultDB() throws MetaException { } } - private boolean areWeAllowedToCreate() { - - Class authCls; - Class authIface; - try { - authCls = hiveConf.getClassByName(hiveConf.getVar(ConfVars.HIVE_AUTHORIZATION_MANAGER)); - authIface = Class.forName("org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthorizerFactory"); - } catch (ClassNotFoundException e) { - LOG.debug("No auth manager specified", e); - return false; - } - if(!authIface.isAssignableFrom(authCls)){ - LOG.warn("Configured auth manager "+authCls.getName()+" doesn't implement "+ ConfVars.HIVE_AUTHENTICATOR_MANAGER); - return false; - } - - return true; - } private void createDefaultRoles() throws MetaException { @@ -551,10 +533,6 @@ private void createDefaultRoles() throws MetaException { return; } - if(!areWeAllowedToCreate()) { - return; - } - RawStore ms = getMS(); try { ms.addRole(ADMIN, ADMIN); @@ -598,9 +576,6 @@ private void addAdminUsers() throws MetaException { LOG.debug("Admin users already added."); return; } - if(!areWeAllowedToCreate()) { - return; - } // now add pre-configured users to admin role String userStr = HiveConf.getVar(hiveConf,ConfVars.USERS_IN_ADMIN_ROLE,"").trim(); if (userStr.isEmpty()) { diff --git a/ql/src/test/results/clientpositive/authorization_9.q.out b/ql/src/test/results/clientpositive/authorization_9.q.out index 12631d8..3ec988c 100644 --- a/ql/src/test/results/clientpositive/authorization_9.q.out +++ b/ql/src/test/results/clientpositive/authorization_9.q.out @@ -63,6 +63,7 @@ PREHOOK: query: show grant on all PREHOOK: type: SHOW_GRANT POSTHOOK: query: show grant on all POSTHOOK: type: SHOW_GRANT + ADMIN ROLE All true -1 ADMIN default hive_test_user USER Select false -1 hive_test_user default hive_test_user2 USER Select false -1 hive_test_user default dummy hive_test_user USER Select false -1 hive_test_user diff --git a/ql/src/test/results/clientpositive/show_roles.q.out b/ql/src/test/results/clientpositive/show_roles.q.out index f5efc59..5591bbb 100644 --- a/ql/src/test/results/clientpositive/show_roles.q.out +++ b/ql/src/test/results/clientpositive/show_roles.q.out @@ -10,5 +10,7 @@ PREHOOK: query: show roles PREHOOK: type: SHOW_ROLES POSTHOOK: query: show roles POSTHOOK: type: SHOW_ROLES +ADMIN +PUBLIC role1 role2