HADOOP-13440. FileContext does not react on changing umask via configuration.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3d191cc1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3d191cc1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3d191cc1 Branch: refs/heads/HADOOP-12756 Commit: 3d191cc15244e1e29f837b34a9bd1d029e003064 Parents: ef501b1 Author: Akira Ajisaka <aajis...@apache.org> Authored: Sun Jul 31 11:29:15 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Sun Jul 31 11:29:15 2016 +0900 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/fs/FileContext.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d191cc1/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java index 7832186..e6a4cf4 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java @@ -215,20 +215,18 @@ public class FileContext { * The FileContext is defined by. * 1) defaultFS (slash) * 2) wd - * 3) umask + * 3) umask (Obtained by FsPermission.getUMask(conf)) */ private final AbstractFileSystem defaultFS; //default FS for this FileContext. private Path workingDir; // Fully qualified - private FsPermission umask; private final Configuration conf; private final UserGroupInformation ugi; final boolean resolveSymlinks; private final Tracer tracer; private FileContext(final AbstractFileSystem defFs, - final FsPermission theUmask, final Configuration aConf) { + final Configuration aConf) { defaultFS = defFs; - umask = theUmask; conf = aConf; tracer = FsTracer.get(aConf); try { @@ -354,7 +352,7 @@ public class FileContext { */ public static FileContext getFileContext(final AbstractFileSystem defFS, final Configuration aConf) { - return new FileContext(defFS, FsPermission.getUMask(aConf), aConf); + return new FileContext(defFS, aConf); } /** @@ -564,7 +562,7 @@ public class FileContext { * @return the umask of this FileContext */ public FsPermission getUMask() { - return umask; + return FsPermission.getUMask(conf); } /** @@ -572,7 +570,7 @@ public class FileContext { * @param newUmask the new umask */ public void setUMask(final FsPermission newUmask) { - umask = newUmask; + FsPermission.setUMask(conf, newUmask); } @@ -673,7 +671,7 @@ public class FileContext { CreateOpts.Perms permOpt = CreateOpts.getOpt(CreateOpts.Perms.class, opts); FsPermission permission = (permOpt != null) ? permOpt.getValue() : FILE_DEFAULT_PERM; - permission = permission.applyUMask(umask); + permission = permission.applyUMask(getUMask()); final CreateOpts[] updatedOpts = CreateOpts.setOpt(CreateOpts.perms(permission), opts); @@ -720,7 +718,7 @@ public class FileContext { IOException { final Path absDir = fixRelativePart(dir); final FsPermission absFerms = (permission == null ? - FsPermission.getDirDefault() : permission).applyUMask(umask); + FsPermission.getDirDefault() : permission).applyUMask(getUMask()); new FSLinkResolver<Void>() { @Override public Void next(final AbstractFileSystem fs, final Path p) --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
