ivandika3 commented on code in PR #10498: URL: https://github.com/apache/ozone/pull/10498#discussion_r3417625769
########## hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/tagging/S3DeleteBucketTaggingRequest.java: ########## @@ -0,0 +1,174 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.om.request.s3.tagging; + +import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.LeveledResource.BUCKET_LOCK; + +import java.io.IOException; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.hadoop.hdds.utils.db.cache.CacheKey; +import org.apache.hadoop.hdds.utils.db.cache.CacheValue; +import org.apache.hadoop.ozone.audit.OMAction; +import org.apache.hadoop.ozone.om.OMMetadataManager; +import org.apache.hadoop.ozone.om.OMMetrics; +import org.apache.hadoop.ozone.om.OzoneManager; +import org.apache.hadoop.ozone.om.OzoneManagerUtils; +import org.apache.hadoop.ozone.om.ResolvedBucket; +import org.apache.hadoop.ozone.om.execution.flowcontrol.ExecutionContext; +import org.apache.hadoop.ozone.om.helpers.OmBucketArgs; +import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; +import org.apache.hadoop.ozone.om.request.OMClientRequest; +import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; +import org.apache.hadoop.ozone.om.response.OMClientResponse; +import org.apache.hadoop.ozone.om.response.bucket.OMBucketSetPropertyResponse; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.BucketArgs; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteBucketTaggingRequest; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeleteBucketTaggingResponse; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest; +import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; +import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer; +import org.apache.hadoop.ozone.security.acl.OzoneObj; +import org.apache.hadoop.util.Time; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Handles DeleteBucketTagging (S3 bucket tagging). + */ +public class S3DeleteBucketTaggingRequest extends OMClientRequest { + + private static final Logger LOG = + LoggerFactory.getLogger(S3DeleteBucketTaggingRequest.class); + + public S3DeleteBucketTaggingRequest(OMRequest omRequest) { + super(omRequest); + } + + @Override + public OMRequest preExecute(OzoneManager ozoneManager) + throws IOException { + DeleteBucketTaggingRequest.Builder req = + getOmRequest().getDeleteBucketTaggingRequest().toBuilder(); + req.setModificationTime(Time.now()); + return getOmRequest().toBuilder() + .setDeleteBucketTaggingRequest(req.build()) + .setUserInfo(getUserInfo()) + .build(); + } + + @Override + public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, + ExecutionContext context) { + final long transactionLogIndex = context.getIndex(); + + DeleteBucketTaggingRequest deleteBucketTaggingRequest = + getOmRequest().getDeleteBucketTaggingRequest(); + Objects.requireNonNull(deleteBucketTaggingRequest, + "deleteBucketTaggingRequest == null"); + + OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager(); + OMMetrics omMetrics = ozoneManager.getMetrics(); + omMetrics.incNumDeleteBucketTagging(); + + BucketArgs bucketArgs = deleteBucketTaggingRequest.getBucketArgs(); + OmBucketArgs omBucketArgs = OmBucketArgs.getFromProtobuf(bucketArgs); + + String volumeName = bucketArgs.getVolumeName(); + String bucketName = bucketArgs.getBucketName(); + + OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder( + getOmRequest()); + OmBucketInfo omBucketInfo = null; + + Exception exception = null; + boolean acquiredBucketLock = false; + boolean success = true; + OMClientResponse omClientResponse = null; + ResolvedBucket resolvedBucket = null; + String realVolume = null; + String realBucket = null; + try { + resolvedBucket = ozoneManager.resolveBucketLink( + Pair.of(volumeName, bucketName), this); + realVolume = resolvedBucket.realVolume(); + realBucket = resolvedBucket.realBucket(); + + if (ozoneManager.getAclsEnabled()) { + checkAcls(ozoneManager, OzoneObj.ResourceType.BUCKET, + OzoneObj.StoreType.OZONE, IAccessAuthorizer.ACLType.WRITE, + realVolume, realBucket, null); + } Review Comment: I think we can move the permission check to `preExecute`, there is an ongoing effort to move permission check to `preExecute` in HDDS-13634. Similarly for `S3PutBucketTaggingRequest`. ########## hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java: ########## @@ -2752,6 +2754,30 @@ public void deleteObjectTagging(OmKeyArgs args) throws IOException { handleError(omResponse); } + // TODO: Add putBucketTagging and deleteBucketTagging APIs. + + @Override + public Map<String, String> getBucketTagging(OmBucketArgs args) throws IOException { + BucketArgs bucketArgs = BucketArgs.newBuilder() + .setVolumeName(args.getVolumeName()) + .setBucketName(args.getBucketName()) + .build(); + + GetBucketTaggingRequest req = + GetBucketTaggingRequest.newBuilder() + .setBucketArgs(bucketArgs) + .build(); + + OMRequest omRequest = createOMRequest(Type.GetBucketTagging) + .setGetBucketTaggingRequest(req) + .build(); + + GetBucketTaggingResponse resp = + handleError(submitRequest(omRequest)).getGetBucketTaggingResponse(); + + return KeyValueUtil.getFromProtobuf(resp.getTagsList()); + } Review Comment: Since this is a OM only change, should we address this in the client patch? ########## hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java: ########## @@ -17,6 +17,7 @@ package org.apache.hadoop.ozone.protocolPB; +import static java.awt.Event.ENTER; Review Comment: Unused import? -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
