You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by GitBox <gi...@apache.org> on 2021/08/15 13:12:00 UTC
[GitHub] [ozone] rakeshadr commented on a change in pull request #2533: HDDS-5370. [FSO] Handle OMClientRequest based on the bucket layout.
rakeshadr commented on a change in pull request #2533:
URL: https://github.com/apache/ozone/pull/2533#discussion_r689087702
##########
File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
##########
@@ -281,10 +287,12 @@ private static OMClientRequest getOMAclRequest(OMRequest omRequest) {
} else if (ObjectType.BUCKET == type) {
return new OMBucketRemoveAclRequest(omRequest);
} else if (ObjectType.KEY == type) {
- if (isBucketFSOptimized()){
+ OMKeyRemoveAclRequest aclReq = new OMKeyRemoveAclRequest(omRequest);
+ OmBucketInfo buckInfo = aclReq.getBucketInfo(ozoneManager);
+ if (buckInfo.equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)) {
Review comment:
`buckInfo.equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)`
There is a findbug on this statement.
Please use getLayout while comparing, spomething like `buckInfo.getLaytout().equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)`
##########
File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
##########
@@ -437,4 +447,117 @@ private static ServiceException createLeaderNotReadyException(
return new ServiceException(leaderNotReadyException);
}
+ public static boolean isBucketFSOptimized(OMRequest omRequest,
+ OzoneManager ozoneManager) {
+ Type cmdType = omRequest.getCmdType();
+ BucketLayout bucketLayout = null;
+ OmBucketInfo buckInfo = null;
+ switch (cmdType) {
+ case AllocateBlock:
+ String volName =
+ omRequest.getAllocateBlockRequest().getKeyArgs().getVolumeName();
+ String buckName =
+ omRequest.getAllocateBlockRequest().getKeyArgs().getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case CreateKey:
+ volName = omRequest.getCreateKeyRequest().getKeyArgs().getVolumeName();
+ buckName = omRequest.getCreateKeyRequest().getKeyArgs().getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case CommitKey:
+ volName = omRequest.getCommitKeyRequest().getKeyArgs().getVolumeName();
+ buckName = omRequest.getCommitKeyRequest().getKeyArgs().getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case DeleteKey:
+ volName = omRequest.getDeleteKeyRequest().getKeyArgs().getVolumeName();
+ buckName = omRequest.getDeleteKeyRequest().getKeyArgs().getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case CreateFile:
+ volName = omRequest.getCreateFileRequest().getKeyArgs().getVolumeName();
+ buckName = omRequest.getCreateFileRequest().getKeyArgs().getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case CreateDirectory:
+ volName =
+ omRequest.getCreateDirectoryRequest().getKeyArgs().getVolumeName();
+ buckName =
+ omRequest.getCreateDirectoryRequest().getKeyArgs().getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case RenameKey:
+ volName = omRequest.getRenameKeyRequest().getKeyArgs().getVolumeName();
+ buckName = omRequest.getRenameKeyRequest().getKeyArgs().getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case InitiateMultiPartUpload:
+ volName = omRequest.getInitiateMultiPartUploadRequest().getKeyArgs()
+ .getVolumeName();
+ buckName = omRequest.getInitiateMultiPartUploadRequest().getKeyArgs()
+ .getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case CommitMultiPartUpload:
+ volName = omRequest.getCommitMultiPartUploadRequest().getKeyArgs()
+ .getVolumeName();
+ buckName = omRequest.getCommitMultiPartUploadRequest().getKeyArgs()
+ .getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case AbortMultiPartUpload:
+ volName = omRequest.getAbortMultiPartUploadRequest().getKeyArgs()
+ .getVolumeName();
+ buckName = omRequest.getAbortMultiPartUploadRequest().getKeyArgs()
+ .getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ case CompleteMultiPartUpload:
+ volName = omRequest.getCompleteMultiPartUploadRequest().getKeyArgs()
+ .getVolumeName();
+ buckName = omRequest.getCompleteMultiPartUploadRequest().getKeyArgs()
+ .getBucketName();
+ buckInfo = getOmBucketInfo(ozoneManager, buckInfo, volName, buckName);
+ bucketLayout = getBucketLayout(buckInfo);
+ break;
+ default:
+ break;
+ }
Review comment:
`bucketLayout.equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)`, there is a findbug warn, please modify like below.
bucketLayout can be null, please do `BucketLayout.FILE_SYSTEM_OPTIMIZED.equals(bucketLayout)`.
Also, please add a TODO to handle the case of null buckInfo.
--
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.
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org