diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java index 275cfc4..12e984e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java @@ -293,7 +293,7 @@ public abstract class FSUtils { .getDeclaredMethod("create", Path.class, FsPermission.class, boolean.class, int.class, short.class, long.class, Progressable.class, InetSocketAddress[].class) - .invoke(backingFs, path, FsPermission.getDefault(), true, + .invoke(backingFs, path, perm, true, getDefaultBufferSize(backingFs), getDefaultReplication(backingFs, path), getDefaultBlockSize(backingFs, path), @@ -366,7 +366,7 @@ public abstract class FSUtils { // make sure that we have a mask, if not, go default. String mask = conf.get(permssionConfKey); if (mask == null) - return FsPermission.getDefault(); + return FsPermission.getFileDefault(); // appy the umask FsPermission umask = new FsPermission(mask); return perm.applyUMask(umask); @@ -375,10 +375,10 @@ public abstract class FSUtils { "Incorrect umask attempted to be created: " + conf.get(permssionConfKey) + ", using default file permissions.", e); - return FsPermission.getDefault(); + return FsPermission.getFileDefault(); } } - return FsPermission.getDefault(); + return FsPermission.getFileDefault(); } /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java index 8178ab1..43770fe 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java @@ -237,7 +237,7 @@ public class TestFSUtils { // first check that we don't crash if we don't have perms set FsPermission defaultPerms = FSUtils.getFilePermissions(fs, conf, HConstants.DATA_FILE_UMASK_KEY); - assertEquals(FsPermission.getDefault(), defaultPerms); + assertEquals(FsPermission.getFileDefault(), defaultPerms); conf.setStrings(HConstants.DATA_FILE_UMASK_KEY, "077"); // now check that we get the right perms