commit 8f0c850aae2035ed295d1017f3cbdfd00c119858 Author: Chris Drome Date: Fri Jun 10 19:29:43 2016 +0000 HIVE-13990: Client should not check dfs.namenode.acls.enabled to determine if extended ACLs are supported diff --git common/pom.xml common/pom.xml index b7244aa..9dfd134 100644 --- common/pom.xml +++ common/pom.xml @@ -150,6 +150,12 @@ + + org.apache.hadoop + hadoop-hdfs + ${hadoop.version} + true + com.google.code.tempus-fugit diff --git hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java index 7b50afd..70336c1 100644 --- hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java +++ hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/FileOutputCommitterContainer.java @@ -37,6 +37,7 @@ import org.apache.hadoop.fs.permission.AclEntryType; import org.apache.hadoop.fs.permission.AclStatus; import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.hdfs.protocol.AclException; import org.apache.hadoop.hive.common.FileUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.IMetaStoreClient; @@ -795,15 +796,15 @@ private void registerPartitions(JobContext context) throws IOException{ FsPermission perms = tblStat.getPermission(); ArrayList acls = null; - if (conf.getBoolean("dfs.namenode.acls.enabled", false)) { - try { - AclStatus stat = fs.getAclStatus(tblPath); - if (hasExtendedAcls(stat)) { - acls = getDefaultAclEntries(stat, perms); - } - } catch (UnsupportedOperationException e) { - LOG.debug("Skipping ACLs", e); + try { + AclStatus stat = fs.getAclStatus(tblPath); + if (hasExtendedAcls(stat)) { + acls = getDefaultAclEntries(stat, perms); } + } catch (AclException e) { + LOG.debug("Skipping ACLs", e); + } catch (UnsupportedOperationException e) { + LOG.debug("Skipping ACLs", e); } List partitionsToAdd = new ArrayList(); diff --git metastore/pom.xml metastore/pom.xml index 7f75d4db..e875ae0 100644 --- metastore/pom.xml +++ metastore/pom.xml @@ -169,6 +169,13 @@ + org.apache.hadoop + hadoop-hdfs + ${hadoop.version} + test + true + + org.apache.thrift libfb303 ${libfb303.version}