Skip to content

Commit

Permalink
HDDS-8649. Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ceekay committed Jan 23, 2024
1 parent b236c8e commit bc85894
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils;
import org.apache.hadoop.ozone.om.service.DirectoryDeletingService;
import org.apache.hadoop.ozone.om.service.KeyDeletingService;
import org.apache.hadoop.ozone.om.service.MultipartUploadCleanupService;
Expand Down Expand Up @@ -805,8 +806,8 @@ public OmMultipartUploadListParts listParts(String volumeName,
//if there are no parts, use the replicationType from the open key.
if (isBucketFSOptimized(volumeName, bucketName)) {
multipartKey =
metadataManager.getMultipartKeyFSO(volumeName, bucketName, keyName,
uploadID);
OMMultipartUploadUtils.getMultipartOpenKey(volumeName, bucketName, keyName, uploadID,
metadataManager, BucketLayout.FILE_SYSTEM_OPTIMIZED);
}
OmKeyInfo omKeyInfo =
metadataManager.getOpenKeyTable(bucketLayout)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,10 @@ public static String getMultipartOpenKey(String volumeName,
if (bucketLayout == BucketLayout.FILE_SYSTEM_OPTIMIZED) {
return omMetadataManager.getMultipartKeyFSO(volumeName, bucketName, keyName, multipartUploadId);
} else {
return getMultipartOpenKey(volumeName, bucketName,
keyName, multipartUploadId, omMetadataManager);
return omMetadataManager.getMultipartKey(volumeName, bucketName, keyName, multipartUploadId);
}
}

public static String getMultipartOpenKey(String volumeName,
String bucketName, String keyName, String multipartUploadId,
OMMetadataManager omMetadataManager) {
return omMetadataManager.getMultipartKey(
volumeName, bucketName, keyName, multipartUploadId);
}


/**
* Check whether key's isMultipartKey flag is set.
Expand Down

0 comments on commit bc85894

Please sign in to comment.