You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/08/21 19:38:07 UTC
svn commit: r1619493 - in /hive/branches/spark: ./
itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestUtilitiesDfs.java
ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java
Author: brock
Date: Thu Aug 21 17:38:06 2014
New Revision: 1619493
URL: http://svn.apache.org/r1619493
Log:
Merge HIVE-7807 - Refer to umask property using FsPermission.UMASK_LABEL (Venki Korukanti via Brock)
Added:
hive/branches/spark/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestUtilitiesDfs.java
- copied unchanged from r1619488, hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestUtilitiesDfs.java
Modified:
hive/branches/spark/ (props changed)
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java
Propchange: hive/branches/spark/
------------------------------------------------------------------------------
Merged /hive/trunk:r1619488
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1619493&r1=1619492&r2=1619493&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Thu Aug 21 17:38:06 2014
@@ -3494,9 +3494,10 @@ public final class Utilities {
String origUmask, FileSystem fs) throws IOException {
if (unsetUmask) {
if (origUmask != null) {
- conf.set("fs.permissions.umask-mode", origUmask);
+ conf.set(FsPermission.UMASK_LABEL, origUmask);
} else {
- //conf.unset("fs.permissions.umask-mode");
+ // TODO HIVE-7831
+ // conf.unset(FsPermission.UMASK_LABEL);
}
}
@@ -3510,10 +3511,10 @@ public final class Utilities {
recursive);
if (recursive) {
- origUmask = conf.get("fs.permissions.umask-mode");
+ origUmask = conf.get(FsPermission.UMASK_LABEL);
// this umask is required because by default the hdfs mask is 022 resulting in
// all parents getting the fsPermission & !(022) permission instead of fsPermission
- conf.set("fs.permissions.umask-mode", "000");
+ conf.set(FsPermission.UMASK_LABEL, "000");
}
FileSystem fs = ShimLoader.getHadoopShims().getNonCachedFileSystem(mkdirPath.toUri(), conf);
Modified: hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java?rev=1619493&r1=1619492&r2=1619493&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java (original)
+++ hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java Thu Aug 21 17:38:06 2014
@@ -118,14 +118,13 @@ public class TestUtilities extends TestC
}
private void checkFSUMaskReset(boolean recursiveArg) throws IllegalArgumentException, IOException {
- final String FS_MASK_PARAM = "fs.permissions.umask-mode";
final String FS_MASK_VAL = "055";
HiveConf conf = new HiveConf();
String dir = System.getProperty("test.tmp.dir") + "/testUtilitiesUMaskReset";
- conf.set(FS_MASK_PARAM, FS_MASK_VAL);
+ conf.set(FsPermission.UMASK_LABEL, FS_MASK_VAL);
Utilities.createDirsWithPermission(conf, new Path(dir), new FsPermission((short) 00777),
recursiveArg);
- assertEquals(conf.get(FS_MASK_PARAM), FS_MASK_VAL);
+ assertEquals(conf.get(FsPermission.UMASK_LABEL), FS_MASK_VAL);
}