xiaoyuyao 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_r290445584
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
##########
@@ -404,27 +407,44 @@ public boolean addAcl(OzoneObj obj, OzoneAcl acl) throws
IOException {
throw new OMException("Bucket " + bucket + " is not found",
BUCKET_NOT_FOUND);
}
- List<OzoneAcl> list = bucketInfo.getAcls();
- if(!validateAddAcl(acl, list)) {
- // New acl can't be added as it is not consistent with existing ACLs.
- LOG.info("New acl:{} can't be added as it is not consistent with " +
- "existing ACLs:{}.", acl, StringUtils.join(",", list));
- return false;
+
+ // Case 1: When we are adding more rights to existing user/group.
+ boolean addToExistingAcl = false;
+ for(OzoneAcl a: bucketInfo.getAcls()) {
+ if(a.getName().equals(acl.getName()) &&
+ a.getType().equals(acl.getType())) {
+ BitSet bits = (BitSet) acl.getAclBitSet().clone();
+ bits.or(a.getAclBitSet());
+
+ if (bits.equals(a.getAclBitSet())) {
+ return false;
+ }
+ a.getAclBitSet().or(acl.getAclBitSet());
+ addToExistingAcl = true;
Review comment:
if we return true here, the boolean addToExistingAcl can be eliminated.
----------------------------------------------------------------
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]
