This is an automated email from the ASF dual-hosted git repository. nanda pushed a commit to branch ozone-0.4.1 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 70c42faca9bc9f2247f95affdc1ab133d76fb850 Author: Anu Engineer <[email protected]> AuthorDate: Wed Jul 10 11:28:18 2019 -0700 HDDS-1611.[Addendum] Evaluate ACL on volume bucket key and prefix to authorize access. Contributed by Ajay Kumar. (#973) Fixes a build break in ozone. (cherry picked from commit 6872efcabfd8fad5658642baa26df0e74399348b) --- .../main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java index d8afb91..bd90b2d 100644 --- a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java +++ b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java @@ -43,10 +43,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException; import org.apache.hadoop.fs.permission.FsPermission; - import org.apache.hadoop.ozone.om.exceptions.OMException; -import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus; - import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.util.Progressable; @@ -632,8 +629,8 @@ public class BasicOzoneFileSystem extends FileSystem { String key = pathToKey(qualifiedPath); FileStatus fileStatus = null; try { - fileStatus = adapter.getFileStatus(key) - .makeQualified(uri, qualifiedPath, getUsername(), getUsername()); + fileStatus = convertFileStatus( + adapter.getFileStatus(key, uri, qualifiedPath, getUsername())); } catch (OMException ex) { if (ex.getResult().equals(OMException.ResultCodes.KEY_NOT_FOUND)) { throw new FileNotFoundException("File not found. path:" + f); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
