ajayydv commented on a change in pull request #885: HDDS-1541. Implement
addAcl,removeAcl,setAcl,getAcl for Key. Contributed by Ajay Kumat.
URL: https://github.com/apache/hadoop/pull/885#discussion_r290502416
##########
File path:
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmOzoneAclMap.java
##########
@@ -105,7 +115,21 @@ public void removeAcl(OzoneAcl acl) throws OMException {
Objects.requireNonNull(acl, "Acl should not be null.");
OzoneAclType aclType = OzoneAclType.valueOf(acl.getType().name());
if (getMap(aclType).containsKey(acl.getName())) {
- getMap(aclType).remove(acl.getName());
+ BitSet aclRights = getMap(aclType).get(acl.getName());
+ BitSet bits = (BitSet) acl.getAclBitSet().clone();
+ bits.and(aclRights);
+
+ if (bits.equals(ZERO_BITSET)) {
+ // throw exception if acl is already added.
+ throw new OMException("Acl [" + acl + "] doesn't exist.",
+ INVALID_REQUEST);
+ }
+
+ acl.getAclBitSet().and(aclRights);
+ aclRights.xor(acl.getAclBitSet());
+ if (aclRights.equals(ZERO_BITSET)) {
+ getMap(aclType).remove(acl.getName());
+ }
} else {
// throw exception if acl is already added.
Review comment:
done.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
