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/02/07 10:05:48 UTC
[GitHub] [ozone] linyiqun commented on a change in pull request #1897: HDDS-4781. [FSO]S3MultiPart: Implement create and commit upload part file
linyiqun commented on a change in pull request #1897:
URL: https://github.com/apache/ozone/pull/1897#discussion_r571589976
##########
File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestV1.java
##########
@@ -0,0 +1,247 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.multipart;
+
+import com.google.common.base.Optional;
+import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
+import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
+import org.apache.hadoop.ozone.OzoneConsts;
+import org.apache.hadoop.ozone.audit.OMAction;
+import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.exceptions.OMException;
+import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
+import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
+import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
+import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
+import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
+import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.s3.multipart.S3MultipartUploadCommitPartResponse;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartCommitUploadPartRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartCommitUploadPartResponse;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
+import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
+
+/**
+ * Handle Multipart upload commit upload part file.
+ */
+public class S3MultipartUploadCommitPartRequestV1
+ extends S3MultipartUploadCommitPartRequest {
+
+ private static final Logger LOG =
+ LoggerFactory.getLogger(S3MultipartUploadCommitPartRequestV1.class);
+
+ public S3MultipartUploadCommitPartRequestV1(OMRequest omRequest) {
+ super(omRequest);
+ }
+
+ @Override
+ @SuppressWarnings("methodlength")
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
+ long trxnLogIndex, OzoneManagerDoubleBufferHelper omDoubleBufferHelper) {
+ MultipartCommitUploadPartRequest multipartCommitUploadPartRequest =
+ getOmRequest().getCommitMultiPartUploadRequest();
+
+ KeyArgs keyArgs = multipartCommitUploadPartRequest.getKeyArgs();
+ Map<String, String> auditMap = buildKeyArgsAuditMap(keyArgs);
+
+ String volumeName = keyArgs.getVolumeName();
+ String bucketName = keyArgs.getBucketName();
+ String keyName = keyArgs.getKeyName();
+
+ OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
+ ozoneManager.getMetrics().incNumCommitMultipartUploadParts();
+
+ boolean acquiredLock = false;
+
+ IOException exception = null;
+ String partName = null;
+ OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
+ getOmRequest());
+ OMClientResponse omClientResponse = null;
+ OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo = null;
+ String openKey = null;
+ OmKeyInfo omKeyInfo = null;
+ String multipartKey = null;
+ OmMultipartKeyInfo multipartKeyInfo = null;
+ Result result = null;
+ OmBucketInfo omBucketInfo = null;
+ OmBucketInfo copyBucketInfo = null;
+ try {
+ keyArgs = resolveBucketLink(ozoneManager, keyArgs, auditMap);
+ volumeName = keyArgs.getVolumeName();
+ bucketName = keyArgs.getBucketName();
+
+ // TODO to support S3 ACL later.
+ acquiredLock = omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
+ volumeName, bucketName);
+
+ validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
+
+ String fileName = OzoneFSUtils.getFileName(keyName);
+ Iterator<Path> pathComponents = Paths.get(keyName).iterator();
+ String bucketKey = omMetadataManager.getBucketKey(volumeName, bucketName);
+ omBucketInfo = omMetadataManager.getBucketTable().get(bucketKey);
+ long bucketId = omBucketInfo.getObjectID();
+ long parentID = OMFileRequest.getParentID(bucketId, pathComponents,
+ keyName, omMetadataManager);
+
+ String uploadID = keyArgs.getMultipartUploadID();
+ multipartKey = omMetadataManager.getMultipartKey(parentID,
+ fileName, uploadID);
+
+ multipartKeyInfo = omMetadataManager.getMultipartInfoTable()
+ .get(multipartKey);
+
+ long clientID = multipartCommitUploadPartRequest.getClientID();
+
+ openKey = omMetadataManager.getOpenFileName(parentID, fileName, clientID);
+
+ omKeyInfo = OMFileRequest.getOmKeyInfoFromFileTable(true,
+ omMetadataManager, openKey, keyName);
+
+ if (omKeyInfo == null) {
+ throw new OMException("Failed to commit Multipart Upload key, as " +
+ openKey + "entry is not found in the openKey table",
+ KEY_NOT_FOUND);
+ }
+
+ // set the data size and location info list
+ omKeyInfo.setDataSize(keyArgs.getDataSize());
+ omKeyInfo.updateLocationInfoList(keyArgs.getKeyLocationsList().stream()
+ .map(OmKeyLocationInfo::getFromProtobuf)
+ .collect(Collectors.toList()));
+ // Set Modification time
+ omKeyInfo.setModificationTime(keyArgs.getModificationTime());
+ // Set the UpdateID to current transactionLogIndex
+ omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled());
+
+ String ozoneKey = omMetadataManager.getOzonePathKey(parentID, fileName);
+ partName = ozoneKey + clientID;
+
+ if (multipartKeyInfo == null) {
+ // This can occur when user started uploading part by the time commit
+ // of that part happens, in between the user might have requested
+ // abort multipart upload. If we just throw exception, then the data
+ // will not be garbage collected, so move this part to delete table
+ // and throw error
+ // Move this part to delete table.
+ throw new OMException("No such Multipart upload is with specified " +
+ "uploadId " + uploadID,
+ OMException.ResultCodes.NO_SUCH_MULTIPART_UPLOAD_ERROR);
+ }
+
+ int partNumber = keyArgs.getMultipartNumber();
+ oldPartKeyInfo = multipartKeyInfo.getPartKeyInfo(partNumber);
+
+ // Build this multipart upload part info.
+ OzoneManagerProtocolProtos.PartKeyInfo.Builder partKeyInfo =
+ OzoneManagerProtocolProtos.PartKeyInfo.newBuilder();
+ partKeyInfo.setPartName(partName);
+ partKeyInfo.setPartNumber(partNumber);
+ partKeyInfo.setPartKeyInfo(omKeyInfo.getProtobuf(
+ getOmRequest().getVersion()));
+
+ // Add this part information in to multipartKeyInfo.
+ multipartKeyInfo.addPartKeyInfo(partNumber, partKeyInfo.build());
+
+ // Set the UpdateID to current transactionLogIndex
+ multipartKeyInfo.setUpdateID(trxnLogIndex,
+ ozoneManager.isRatisEnabled());
+
+ // OldPartKeyInfo will be deleted. Its updateID will be set in
+ // S3MultipartUplodaCommitPartResponse before being added to
+ // DeletedKeyTable.
+
+ // Add to cache.
+
+ // Delete from open key table and add it to multipart info table.
+ // No need to add cache entries to delete table, as no
+ // read/write requests that info for validation.
+ omMetadataManager.getMultipartInfoTable().addCacheEntry(
+ new CacheKey<>(multipartKey),
+ new CacheValue<>(Optional.of(multipartKeyInfo),
+ trxnLogIndex));
+
+ omMetadataManager.getOpenKeyTable().addCacheEntry(
+ new CacheKey<>(openKey),
Review comment:
I noticed that in S3InitiateMultipartUploadRequest, we also use multipartKey as the open key inserted into openKey table. Why here we have a new open key defined for this? Not so fully get this.
##########
File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestV1.java
##########
@@ -0,0 +1,247 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.multipart;
+
+import com.google.common.base.Optional;
+import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
+import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
+import org.apache.hadoop.ozone.OzoneConsts;
+import org.apache.hadoop.ozone.audit.OMAction;
+import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.exceptions.OMException;
+import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
+import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
+import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
+import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
+import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
+import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.s3.multipart.S3MultipartUploadCommitPartResponse;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartCommitUploadPartRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartCommitUploadPartResponse;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
+import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
+
+/**
+ * Handle Multipart upload commit upload part file.
+ */
+public class S3MultipartUploadCommitPartRequestV1
+ extends S3MultipartUploadCommitPartRequest {
+
+ private static final Logger LOG =
+ LoggerFactory.getLogger(S3MultipartUploadCommitPartRequestV1.class);
+
+ public S3MultipartUploadCommitPartRequestV1(OMRequest omRequest) {
+ super(omRequest);
+ }
+
+ @Override
+ @SuppressWarnings("methodlength")
+ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
+ long trxnLogIndex, OzoneManagerDoubleBufferHelper omDoubleBufferHelper) {
+ MultipartCommitUploadPartRequest multipartCommitUploadPartRequest =
+ getOmRequest().getCommitMultiPartUploadRequest();
+
+ KeyArgs keyArgs = multipartCommitUploadPartRequest.getKeyArgs();
+ Map<String, String> auditMap = buildKeyArgsAuditMap(keyArgs);
+
+ String volumeName = keyArgs.getVolumeName();
+ String bucketName = keyArgs.getBucketName();
+ String keyName = keyArgs.getKeyName();
+
+ OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
+ ozoneManager.getMetrics().incNumCommitMultipartUploadParts();
+
+ boolean acquiredLock = false;
+
+ IOException exception = null;
+ String partName = null;
+ OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
+ getOmRequest());
+ OMClientResponse omClientResponse = null;
+ OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo = null;
+ String openKey = null;
+ OmKeyInfo omKeyInfo = null;
+ String multipartKey = null;
+ OmMultipartKeyInfo multipartKeyInfo = null;
+ Result result = null;
+ OmBucketInfo omBucketInfo = null;
+ OmBucketInfo copyBucketInfo = null;
+ try {
+ keyArgs = resolveBucketLink(ozoneManager, keyArgs, auditMap);
+ volumeName = keyArgs.getVolumeName();
+ bucketName = keyArgs.getBucketName();
+
+ // TODO to support S3 ACL later.
+ acquiredLock = omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
+ volumeName, bucketName);
+
+ validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
+
+ String fileName = OzoneFSUtils.getFileName(keyName);
+ Iterator<Path> pathComponents = Paths.get(keyName).iterator();
+ String bucketKey = omMetadataManager.getBucketKey(volumeName, bucketName);
+ omBucketInfo = omMetadataManager.getBucketTable().get(bucketKey);
+ long bucketId = omBucketInfo.getObjectID();
+ long parentID = OMFileRequest.getParentID(bucketId, pathComponents,
+ keyName, omMetadataManager);
+
+ String uploadID = keyArgs.getMultipartUploadID();
+ multipartKey = omMetadataManager.getMultipartKey(parentID,
+ fileName, uploadID);
+
+ multipartKeyInfo = omMetadataManager.getMultipartInfoTable()
+ .get(multipartKey);
+
+ long clientID = multipartCommitUploadPartRequest.getClientID();
+
+ openKey = omMetadataManager.getOpenFileName(parentID, fileName, clientID);
+
+ omKeyInfo = OMFileRequest.getOmKeyInfoFromFileTable(true,
+ omMetadataManager, openKey, keyName);
+
+ if (omKeyInfo == null) {
+ throw new OMException("Failed to commit Multipart Upload key, as " +
+ openKey + "entry is not found in the openKey table",
+ KEY_NOT_FOUND);
+ }
+
+ // set the data size and location info list
+ omKeyInfo.setDataSize(keyArgs.getDataSize());
+ omKeyInfo.updateLocationInfoList(keyArgs.getKeyLocationsList().stream()
+ .map(OmKeyLocationInfo::getFromProtobuf)
+ .collect(Collectors.toList()));
+ // Set Modification time
+ omKeyInfo.setModificationTime(keyArgs.getModificationTime());
+ // Set the UpdateID to current transactionLogIndex
+ omKeyInfo.setUpdateID(trxnLogIndex, ozoneManager.isRatisEnabled());
+
+ String ozoneKey = omMetadataManager.getOzonePathKey(parentID, fileName);
+ partName = ozoneKey + clientID;
+
+ if (multipartKeyInfo == null) {
+ // This can occur when user started uploading part by the time commit
+ // of that part happens, in between the user might have requested
+ // abort multipart upload. If we just throw exception, then the data
+ // will not be garbage collected, so move this part to delete table
+ // and throw error
+ // Move this part to delete table.
+ throw new OMException("No such Multipart upload is with specified " +
+ "uploadId " + uploadID,
+ OMException.ResultCodes.NO_SUCH_MULTIPART_UPLOAD_ERROR);
+ }
+
+ int partNumber = keyArgs.getMultipartNumber();
+ oldPartKeyInfo = multipartKeyInfo.getPartKeyInfo(partNumber);
+
+ // Build this multipart upload part info.
+ OzoneManagerProtocolProtos.PartKeyInfo.Builder partKeyInfo =
+ OzoneManagerProtocolProtos.PartKeyInfo.newBuilder();
+ partKeyInfo.setPartName(partName);
+ partKeyInfo.setPartNumber(partNumber);
+ partKeyInfo.setPartKeyInfo(omKeyInfo.getProtobuf(
+ getOmRequest().getVersion()));
+
+ // Add this part information in to multipartKeyInfo.
+ multipartKeyInfo.addPartKeyInfo(partNumber, partKeyInfo.build());
+
+ // Set the UpdateID to current transactionLogIndex
+ multipartKeyInfo.setUpdateID(trxnLogIndex,
+ ozoneManager.isRatisEnabled());
+
+ // OldPartKeyInfo will be deleted. Its updateID will be set in
+ // S3MultipartUplodaCommitPartResponse before being added to
+ // DeletedKeyTable.
+
+ // Add to cache.
+
+ // Delete from open key table and add it to multipart info table.
+ // No need to add cache entries to delete table, as no
+ // read/write requests that info for validation.
+ omMetadataManager.getMultipartInfoTable().addCacheEntry(
+ new CacheKey<>(multipartKey),
+ new CacheValue<>(Optional.of(multipartKeyInfo),
+ trxnLogIndex));
+
+ omMetadataManager.getOpenKeyTable().addCacheEntry(
+ new CacheKey<>(openKey),
+ new CacheValue<>(Optional.absent(), trxnLogIndex));
+
+ long scmBlockSize = ozoneManager.getScmBlockSize();
+ int factor = omKeyInfo.getFactor().getNumber();
+ omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName);
+ // Block was pre-requested and UsedBytes updated when createKey and
+ // AllocatedBlock. The space occupied by the Key shall be based on
+ // the actual Key size, and the total Block size applied before should
+ // be subtracted.
+ long correctedSpace = omKeyInfo.getDataSize() * factor -
+ keyArgs.getKeyLocationsList().size() * scmBlockSize * factor;
+ omBucketInfo.incrUsedBytes(correctedSpace);
+
+ omResponse.setCommitMultiPartUploadResponse(
+ MultipartCommitUploadPartResponse.newBuilder()
+ .setPartName(partName));
+ omClientResponse = new S3MultipartUploadCommitPartResponse(
Review comment:
Suppose we still need to have S3MultipartUploadCommitPartResponseV1 class. The cleanup table of OPEN_KEY_TABLE in S3MultipartUploadCommitPartResponse should replaced by OPEN_FILE_TABLE.
```java
@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, DELETED_TABLE,
MULTIPARTINFO_TABLE})
public class S3MultipartUploadCommitPartResponse extends OMClientResponse {
...
```
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org