This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new e201055496 HDDS-8717. Optimize checkACLsWithFSO to reduce redundant
checks (#4799)
e201055496 is described below
commit e201055496331f1301fdd6721dd4a5788ddca5b8
Author: Hongbing Wang <[email protected]>
AuthorDate: Wed Jun 7 01:19:21 2023 +0800
HDDS-8717. Optimize checkACLsWithFSO to reduce redundant checks (#4799)
---
.../hadoop/ozone/om/request/OMClientRequest.java | 29 ----------------------
1 file changed, 29 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
index 963eddc06c..2ca3b8debf 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
@@ -265,41 +265,12 @@ public abstract class OMClientRequest implements
RequestAuditor {
contextBuilder.setAclType(IAccessAuthorizer.ACLIdentityType.USER);
boolean isVolOwner = isOwner(currentUser, volumeOwner);
- IAccessAuthorizer.ACLType parentAclRight = aclType;
if (isVolOwner) {
contextBuilder.setOwnerName(volumeOwner);
} else {
contextBuilder.setOwnerName(bucketOwner);
}
- if (ozoneManager.getOmMetadataReader().isNativeAuthorizerEnabled()) {
- if (aclType == IAccessAuthorizer.ACLType.CREATE ||
- aclType == IAccessAuthorizer.ACLType.DELETE ||
- aclType == IAccessAuthorizer.ACLType.WRITE_ACL) {
- parentAclRight = IAccessAuthorizer.ACLType.WRITE;
- } else if (aclType == IAccessAuthorizer.ACLType.READ_ACL ||
- aclType == IAccessAuthorizer.ACLType.LIST) {
- parentAclRight = IAccessAuthorizer.ACLType.READ;
- }
- } else {
- parentAclRight = IAccessAuthorizer.ACLType.READ;
- }
- OzoneObj volumeObj = OzoneObjInfo.Builder.newBuilder()
- .setResType(OzoneObj.ResourceType.VOLUME)
- .setStoreType(OzoneObj.StoreType.OZONE)
- .setVolumeName(volumeName)
- .setBucketName(bucketName)
- .setKeyName(keyName).build();
- RequestContext volumeContext = RequestContext.newBuilder()
- .setClientUgi(currentUser)
- .setIp(getRemoteAddress())
- .setHost(getHostName())
- .setAclType(IAccessAuthorizer.ACLIdentityType.USER)
- .setAclRights(parentAclRight)
- .setOwnerName(volumeOwner)
- .build();
- ozoneManager.getOmMetadataReader().checkAcls(volumeObj,
- volumeContext, true);
ozoneManager.getOmMetadataReader().checkAcls(obj,
contextBuilder.build(), true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
