commit 6328f21dbbf2c2cea02e313fb76287f8f94513d0 Author: Mithun RK Date: Wed Aug 2 13:51:02 2017 -0700 HIVE-15686: Partitions on Remote HDFS break encryption-zone checks. (Mithun Radhakrishnan, reviewed by Owen O'Malley) 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 114996d..4d68948 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -1761,13 +1761,13 @@ private void checkTrashPurgeCombination(Path pathToData, String objectName, bool try { trashEnabled = 0 < hiveConf.getFloat("fs.trash.interval", -1); } catch(NumberFormatException ex) { - // nothing to do + // nothing to do } if (trashEnabled) { try { HadoopShims.HdfsEncryptionShim shim = - ShimLoader.getHadoopShims().createHdfsEncryptionShim(FileSystem.get(hiveConf), hiveConf); + ShimLoader.getHadoopShims().createHdfsEncryptionShim(pathToData.getFileSystem(hiveConf), hiveConf); if (shim.isPathEncrypted(pathToData)) { throw new MetaException("Unable to drop " + objectName + " because it is in an encryption zone" + " and trash is enabled. Use PURGE option to skip trash.");