bharatviswa504 commented on a change in pull request #1204: HDDS-1768. Audit xxxAcl methods in OzoneManager URL: https://github.com/apache/hadoop/pull/1204#discussion_r313677222
########## File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java ########## @@ -2999,23 +3016,36 @@ public OmKeyInfo lookupFile(OmKeyArgs args) throws IOException { */ @Override public boolean addAcl(OzoneObj obj, OzoneAcl acl) throws IOException { - if(isAclEnabled) { - checkAcls(obj.getResourceType(), obj.getStoreType(), ACLType.WRITE_ACL, - obj.getVolumeName(), obj.getBucketName(), obj.getKeyName()); - } - // TODO: Audit ACL operation. - switch (obj.getResourceType()) { - case VOLUME: - return volumeManager.addAcl(obj, acl); - case BUCKET: - return bucketManager.addAcl(obj, acl); - case KEY: - return keyManager.addAcl(obj, acl); - case PREFIX: - return prefixManager.addAcl(obj, acl); - default: - throw new OMException("Unexpected resource type: " + - obj.getResourceType(), INVALID_REQUEST); + boolean auditSuccess = true; + + try{ + if(isAclEnabled) { + checkAcls(obj.getResourceType(), obj.getStoreType(), ACLType.WRITE_ACL, + obj.getVolumeName(), obj.getBucketName(), obj.getKeyName()); + } + switch (obj.getResourceType()) { + case VOLUME: + return volumeManager.addAcl(obj, acl); + case BUCKET: + return bucketManager.addAcl(obj, acl); + case KEY: + return keyManager.addAcl(obj, acl); + case PREFIX: + return prefixManager.addAcl(obj, acl); + default: + throw new OMException("Unexpected resource type: " + + obj.getResourceType(), INVALID_REQUEST); + } + } catch(Exception ex) { + auditSuccess = false; + auditAcl(obj, Arrays.asList(acl), OMAction.ADD_ACL, Review comment: Minor comment: No need of auditSuccess flag, we can use exepection value to decide whether it is success or not. ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-issues-h...@hadoop.apache.org