Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1108. Check s3bucket exists or not before MPU operations.

Browse Source 
Contributed by Bharat Viswanadham.
This commit is contained in:
Anu Engineer 2019-02-14 18:10:18 -08:00
parent 6c8ffdb958
commit 2d83b24994
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
View File

@ -171,6 +171,24 @@ private void validateBucket(String volumeName, String bucketName)
} }
} }
/**
* Check S3 bucket exists or not.
* @param volumeName
* @param bucketName
* @throws IOException
*/
private void validateS3Bucket(String volumeName, String bucketName)
throws IOException {
String bucketKey = metadataManager.getBucketKey(volumeName, bucketName);
//Check if bucket already exists
if (metadataManager.getBucketTable().get(bucketKey) == null) {
LOG.error("bucket not found: {}/{} ", volumeName, bucketName);
throw new OMException("Bucket not found",
OMException.ResultCodes.FAILED_BUCKET_NOT_FOUND);
}
}
@Override @Override
public OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID) public OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID)
throws IOException { throws IOException {
@ -663,6 +681,7 @@ public OmMultipartInfo initiateMultipartUpload(OmKeyArgs omKeyArgs) throws
String keyName = omKeyArgs.getKeyName(); String keyName = omKeyArgs.getKeyName();
metadataManager.getLock().acquireBucketLock(volumeName, bucketName); metadataManager.getLock().acquireBucketLock(volumeName, bucketName);
validateS3Bucket(volumeName, bucketName);
try { try {
long time = Time.monotonicNowNanos(); long time = Time.monotonicNowNanos();
String uploadID = UUID.randomUUID().toString() + "-" + Long.toString( String uploadID = UUID.randomUUID().toString() + "-" + Long.toString(
@ -735,6 +754,7 @@ public OmMultipartCommitUploadPartInfo commitMultipartUploadPart(
int partNumber = omKeyArgs.getMultipartUploadPartNumber(); int partNumber = omKeyArgs.getMultipartUploadPartNumber();
metadataManager.getLock().acquireBucketLock(volumeName, bucketName); metadataManager.getLock().acquireBucketLock(volumeName, bucketName);
validateS3Bucket(volumeName, bucketName);
String partName; String partName;
try { try {
String multipartKey = metadataManager.getMultipartKey(volumeName, String multipartKey = metadataManager.getMultipartKey(volumeName,
@ -822,6 +842,7 @@ public OmMultipartUploadCompleteInfo completeMultipartUpload(
String keyName = omKeyArgs.getKeyName(); String keyName = omKeyArgs.getKeyName();
String uploadID = omKeyArgs.getMultipartUploadID(); String uploadID = omKeyArgs.getMultipartUploadID();
metadataManager.getLock().acquireBucketLock(volumeName, bucketName); metadataManager.getLock().acquireBucketLock(volumeName, bucketName);
validateS3Bucket(volumeName, bucketName);
try { try {
String multipartKey = metadataManager.getMultipartKey(volumeName, String multipartKey = metadataManager.getMultipartKey(volumeName,
bucketName, keyName, uploadID); bucketName, keyName, uploadID);
@ -973,6 +994,7 @@ public void abortMultipartUpload(OmKeyArgs omKeyArgs) throws IOException {
String keyName = omKeyArgs.getKeyName(); String keyName = omKeyArgs.getKeyName();
String uploadID = omKeyArgs.getMultipartUploadID(); String uploadID = omKeyArgs.getMultipartUploadID();
Preconditions.checkNotNull(uploadID, "uploadID cannot be null"); Preconditions.checkNotNull(uploadID, "uploadID cannot be null");
validateS3Bucket(volumeName, bucketName);
metadataManager.getLock().acquireBucketLock(volumeName, bucketName); metadataManager.getLock().acquireBucketLock(volumeName, bucketName);
try { try {