This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 061421f HDFS-15145. HttpFS: getAclStatus() returns permission as
null. Contributed by hemanthboyina.
061421f is described below
commit 061421fc6d66405e7109d17b8818ea023ef3acc2
Author: Inigo Goiri <[email protected]>
AuthorDate: Tue Jan 28 10:04:38 2020 -0800
HDFS-15145. HttpFS: getAclStatus() returns permission as null. Contributed
by hemanthboyina.
---
.../java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java | 2 ++
.../main/java/org/apache/hadoop/fs/http/server/FSOperations.java | 2 ++
.../org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java | 9 +++++----
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
index d92e9fc..d64d205 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
@@ -1135,6 +1135,8 @@ public class HttpFSFileSystem extends FileSystem
.owner((String) json.get(OWNER_JSON))
.group((String) json.get(GROUP_JSON))
.stickyBit((Boolean) json.get(ACL_STICKY_BIT_JSON));
+ final FsPermission permission = toFsPermission(json);
+ aclStatusBuilder.setPermission(permission);
JSONArray entries = (JSONArray) json.get(ACL_ENTRIES_JSON);
for ( Object e : entries ) {
aclStatusBuilder.addEntry(AclEntry.parseAclEntry(e.toString(), true));
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
index 915e14f..5c92667 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
@@ -189,6 +189,8 @@ public class FSOperations {
JSONArray entriesArray = new JSONArray();
inner.put(HttpFSFileSystem.OWNER_JSON, aclStatus.getOwner());
inner.put(HttpFSFileSystem.GROUP_JSON, aclStatus.getGroup());
+ inner.put(HttpFSFileSystem.PERMISSION_JSON,
+ HttpFSFileSystem.permissionToString(aclStatus.getPermission()));
inner.put(HttpFSFileSystem.ACL_STICKY_BIT_JSON, aclStatus.isStickyBit());
for ( AclEntry e : aclStatus.getEntries() ) {
entriesArray.add(e.toString());
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
index 1bd361a..fdd19e9 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java
@@ -946,10 +946,11 @@ public abstract class BaseTestHttpFSWith extends
HFSTestCase {
* @throws Exception
*/
private void assertSameAcls(AclStatus a, AclStatus b) throws Exception {
- assertTrue(a.getOwner().equals(b.getOwner()));
- assertTrue(a.getGroup().equals(b.getGroup()));
- assertTrue(a.isStickyBit() == b.isStickyBit());
- assertTrue(a.getEntries().size() == b.getEntries().size());
+ assertEquals(a.getOwner(), b.getOwner());
+ assertEquals(a.getGroup(), b.getGroup());
+ assertEquals(a.getPermission(), b.getPermission());
+ assertEquals(a.isStickyBit(), b.isStickyBit());
+ assertEquals(a.getEntries().size(), b.getEntries().size());
for (AclEntry e : a.getEntries()) {
assertTrue(b.getEntries().contains(e));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
