diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java index fee31a293133..491759555526 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java @@ -32,7 +32,6 @@ import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.om.OMConfigKeys; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponse; import org.slf4j.Logger; @@ -187,7 +186,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, boolean acquiredLock = false; OmKeyInfo omKeyInfo = null; - OmVolumeArgs omVolumeArgs = null; OmBucketInfo omBucketInfo = null; final List locations = new ArrayList<>(); List missingParentInfos; @@ -279,7 +277,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, .collect(Collectors.toList()); omKeyInfo.appendNewBlocks(newLocationList, false); - omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName); omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName); // check bucket and volume quota long preAllocatedSpace = newLocationList.size() @@ -310,8 +307,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, .setOpenVersion(openVersion).build()) .setCmdType(Type.CreateFile); omClientResponse = new OMFileCreateResponse(omResponse.build(), - omKeyInfo, missingParentInfos, clientID, omVolumeArgs, - omBucketInfo.copyObject()); + omKeyInfo, missingParentInfos, clientID, omBucketInfo.copyObject()); result = Result.SUCCESS; } catch (IOException ex) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java index 1fd4b0754679..c70be2f7b057 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequest.java @@ -26,7 +26,6 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer; @@ -167,7 +166,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, OmKeyInfo openKeyInfo = null; IOException exception = null; - OmVolumeArgs omVolumeArgs = null; OmBucketInfo omBucketInfo = null; boolean acquiredLock = false; @@ -196,7 +194,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, List newLocationList = Collections.singletonList( OmKeyLocationInfo.getFromProtobuf(blockLocation)); - omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName); acquiredLock = omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK, volumeName, bucketName); @@ -221,11 +218,10 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, new CacheValue<>(Optional.of(openKeyInfo), trxnLogIndex)); omBucketInfo.incrUsedBytes(preAllocatedSpace); - omResponse.setAllocateBlockResponse(AllocateBlockResponse.newBuilder() .setKeyLocation(blockLocation).build()); omClientResponse = new OMAllocateBlockResponse(omResponse.build(), - openKeyInfo, clientID, omVolumeArgs, omBucketInfo.copyObject()); + openKeyInfo, clientID, omBucketInfo.copyObject()); LOG.debug("Allocated block for Volume:{}, Bucket:{}, OpenKey:{}", volumeName, bucketName, openKeyName); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java index c914bc0e512c..b3ec69feba76 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java @@ -30,7 +30,6 @@ import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.om.OMConfigKeys; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer; @@ -123,7 +122,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, IOException exception = null; OmKeyInfo omKeyInfo = null; - OmVolumeArgs omVolumeArgs = null; OmBucketInfo omBucketInfo = null; OMClientResponse omClientResponse = null; boolean bucketLockAcquired = false; @@ -193,7 +191,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, long scmBlockSize = ozoneManager.getScmBlockSize(); int factor = omKeyInfo.getFactor().getNumber(); - omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName); 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 @@ -204,8 +201,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, omBucketInfo.incrUsedBytes(correctedSpace); omClientResponse = new OMKeyCommitResponse(omResponse.build(), - omKeyInfo, dbOzoneKey, dbOpenKey, omVolumeArgs, - omBucketInfo.copyObject()); + omKeyInfo, dbOzoneKey, dbOpenKey, omBucketInfo.copyObject()); result = Result.SUCCESS; } catch (IOException ex) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java index 88ade80d40dd..70bf06004b1f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java @@ -31,7 +31,6 @@ import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.om.OMConfigKeys; import org.apache.hadoop.ozone.om.exceptions.OMException; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequest; import org.apache.hadoop.ozone.om.request.file.OMFileRequest; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; @@ -197,7 +196,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager(); OmKeyInfo omKeyInfo = null; - OmVolumeArgs omVolumeArgs = null; OmBucketInfo omBucketInfo = null; final List< OmKeyLocationInfo > locations = new ArrayList<>(); @@ -288,7 +286,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, .collect(Collectors.toList()); omKeyInfo.appendNewBlocks(newLocationList, false); - omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName); omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName); // Here we refer to the implementation of HDFS: // If the key size is 600MB, when createKey, keyLocationInfo in @@ -319,8 +316,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, .setOpenVersion(openVersion).build()) .setCmdType(Type.CreateKey); omClientResponse = new OMKeyCreateResponse(omResponse.build(), - omKeyInfo, missingParentInfos, clientID, omVolumeArgs, - omBucketInfo.copyObject()); + omKeyInfo, missingParentInfos, clientID, omBucketInfo.copyObject()); result = Result.SUCCESS; } catch (IOException ex) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java index a99c02bc0094..593dcec8054a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java @@ -23,7 +23,6 @@ import com.google.common.base.Optional; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer; @@ -109,7 +108,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, boolean acquiredLock = false; OMClientResponse omClientResponse = null; Result result = null; - OmVolumeArgs omVolumeArgs = null; OmBucketInfo omBucketInfo = null; try { keyArgs = resolveBucketLink(ozoneManager, keyArgs, auditMap); @@ -143,7 +141,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, keyName)), new CacheValue<>(Optional.absent(), trxnLogIndex)); - omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName); omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName); long quotaReleased = sumBlockLengths(omKeyInfo); @@ -156,7 +153,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, omClientResponse = new OMKeyDeleteResponse(omResponse .setDeleteKeyResponse(DeleteKeyResponse.newBuilder()).build(), - omKeyInfo, ozoneManager.isRatisEnabled(), omVolumeArgs, + omKeyInfo, ozoneManager.isRatisEnabled(), omBucketInfo.copyObject()); result = Result.SUCCESS; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java index 553f7f0fd33b..fccc662d8b3a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java @@ -32,7 +32,6 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import org.apache.hadoop.hdds.utils.db.cache.CacheKey; -import org.apache.hadoop.hdds.utils.db.cache.CacheValue; import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.om.PrefixManager; @@ -609,30 +608,6 @@ protected boolean checkDirectoryAlreadyExists(String volumeName, return false; } - /** - * Return volume info for the specified volume. If the volume does not - * exist, returns {@code null}. - * @param omMetadataManager - * @param volume - * @return OmVolumeArgs - * @throws IOException - */ - protected OmVolumeArgs getVolumeInfo(OMMetadataManager omMetadataManager, - String volume) { - - OmVolumeArgs volumeArgs = null; - - CacheValue value = - omMetadataManager.getVolumeTable().getCacheValue( - new CacheKey<>(omMetadataManager.getVolumeKey(volume))); - - if (value != null) { - volumeArgs = value.getCacheValue(); - } - - return volumeArgs; - } - /** * @return the number of bytes used by blocks pointed to by {@code omKeyInfo}. */ diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java index 3dc22e8fa25b..0798e3e652f4 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeysDeleteRequest.java @@ -29,7 +29,6 @@ import org.apache.hadoop.ozone.om.ResolvedBucket; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.apache.hadoop.ozone.om.response.OMClientResponse; @@ -156,7 +155,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, } long quotaReleased = 0; - OmVolumeArgs omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName); OmBucketInfo omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName); @@ -177,8 +175,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, .setStatus(deleteStatus).setUnDeletedKeys(unDeletedKeys)) .setStatus(deleteStatus ? OK : PARTIAL_DELETE) .setSuccess(deleteStatus).build(), omKeyInfoList, - ozoneManager.isRatisEnabled(), omVolumeArgs, - omBucketInfo.copyObject()); + ozoneManager.isRatisEnabled(), omBucketInfo.copyObject()); result = Result.SUCCESS; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java index 42dc85d705e4..e7773cfea6c2 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequest.java @@ -24,7 +24,6 @@ import com.google.common.base.Optional; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; import org.slf4j.Logger; @@ -106,7 +105,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, getOmRequest()); OMClientResponse omClientResponse = null; Result result = null; - OmVolumeArgs omVolumeArgs = null; OmBucketInfo omBucketInfo = null; try { keyArgs = resolveBucketLink(ozoneManager, keyArgs, auditMap); @@ -125,7 +123,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, OmKeyInfo omKeyInfo = omMetadataManager.getOpenKeyTable().get(multipartKey); - omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName); omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName); // If there is no entry in openKeyTable, then there is no multipart @@ -168,7 +165,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, omResponse.setAbortMultiPartUploadResponse( MultipartUploadAbortResponse.newBuilder()).build(), multipartKey, multipartKeyInfo, ozoneManager.isRatisEnabled(), - omVolumeArgs, omBucketInfo.copyObject()); + omBucketInfo.copyObject()); result = Result.SUCCESS; } catch (IOException ex) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java index 78c8623ebf3c..78436cca6a67 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java @@ -28,7 +28,6 @@ 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.OmVolumeArgs; import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.key.OMKeyRequest; import org.apache.hadoop.ozone.om.request.util.OmResponseUtil; @@ -116,7 +115,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, String multipartKey = null; OmMultipartKeyInfo multipartKeyInfo = null; Result result = null; - OmVolumeArgs omVolumeArgs = null; OmBucketInfo omBucketInfo = null; OmBucketInfo copyBucketInfo = null; try { @@ -214,7 +212,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, long scmBlockSize = ozoneManager.getScmBlockSize(); int factor = omKeyInfo.getFactor().getNumber(); - omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName); 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 @@ -230,7 +227,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, omClientResponse = new S3MultipartUploadCommitPartResponse( omResponse.build(), multipartKey, openKey, multipartKeyInfo, oldPartKeyInfo, omKeyInfo, - ozoneManager.isRatisEnabled(), omVolumeArgs, + ozoneManager.isRatisEnabled(), omBucketInfo.copyObject()); result = Result.SUCCESS; @@ -240,7 +237,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, omClientResponse = new S3MultipartUploadCommitPartResponse( createErrorOMResponse(omResponse, exception), multipartKey, openKey, multipartKeyInfo, oldPartKeyInfo, omKeyInfo, - ozoneManager.isRatisEnabled(), omVolumeArgs, copyBucketInfo); + ozoneManager.isRatisEnabled(), copyBucketInfo); } finally { addResponseToDoubleBuffer(trxnLogIndex, omClientResponse, omDoubleBufferHelper); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java index de490c5aa85c..8b60dc2aae45 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponse.java @@ -22,7 +22,6 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos @@ -41,10 +40,10 @@ public class OMFileCreateResponse extends OMKeyCreateResponse { public OMFileCreateResponse(@Nonnull OMResponse omResponse, @Nonnull OmKeyInfo omKeyInfo, @Nonnull List parentKeyInfos, - long openKeySessionID, @Nonnull OmVolumeArgs omVolumeArgs, + long openKeySessionID, @Nonnull OmBucketInfo omBucketInfo) { super(omResponse, omKeyInfo, parentKeyInfos, openKeySessionID, - omVolumeArgs, omBucketInfo); + omBucketInfo); } /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java index acc43eef8981..4b2085335505 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponse.java @@ -21,7 +21,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos @@ -41,16 +40,14 @@ public class OMAllocateBlockResponse extends OMClientResponse { private OmKeyInfo omKeyInfo; private long clientID; - private OmVolumeArgs omVolumeArgs; private OmBucketInfo omBucketInfo; public OMAllocateBlockResponse(@Nonnull OMResponse omResponse, @Nonnull OmKeyInfo omKeyInfo, long clientID, - @Nonnull OmVolumeArgs omVolumeArgs, @Nonnull OmBucketInfo omBucketInfo) { + @Nonnull OmBucketInfo omBucketInfo) { super(omResponse); this.omKeyInfo = omKeyInfo; this.clientID = clientID; - this.omVolumeArgs = omVolumeArgs; this.omBucketInfo = omBucketInfo; } @@ -74,7 +71,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, // update bucket usedBytes. omMetadataManager.getBucketTable().putWithBatch(batchOperation, - omMetadataManager.getBucketKey(omVolumeArgs.getVolume(), - omBucketInfo.getBucketName()), omBucketInfo); + omMetadataManager.getBucketKey(omKeyInfo.getVolumeName(), + omKeyInfo.getBucketName()), omBucketInfo); } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java index 8e2f6dce8070..5d43b2784dbd 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponse.java @@ -21,7 +21,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -42,17 +41,15 @@ public class OMKeyCommitResponse extends OMClientResponse { private OmKeyInfo omKeyInfo; private String ozoneKeyName; private String openKeyName; - private OmVolumeArgs omVolumeArgs; private OmBucketInfo omBucketInfo; public OMKeyCommitResponse(@Nonnull OMResponse omResponse, @Nonnull OmKeyInfo omKeyInfo, String ozoneKeyName, String openKeyName, - @Nonnull OmVolumeArgs omVolumeArgs, @Nonnull OmBucketInfo omBucketInfo) { + @Nonnull OmBucketInfo omBucketInfo) { super(omResponse); this.omKeyInfo = omKeyInfo; this.ozoneKeyName = ozoneKeyName; this.openKeyName = openKeyName; - this.omVolumeArgs = omVolumeArgs; this.omBucketInfo = omBucketInfo; } @@ -78,7 +75,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, // update bucket usedBytes. omMetadataManager.getBucketTable().putWithBatch(batchOperation, - omMetadataManager.getBucketKey(omVolumeArgs.getVolume(), + omMetadataManager.getBucketKey(omBucketInfo.getVolumeName(), omBucketInfo.getBucketName()), omBucketInfo); } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java index 60f6bfe32504..98b1927ae75f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponse.java @@ -25,7 +25,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos @@ -48,18 +47,15 @@ public class OMKeyCreateResponse extends OMClientResponse { private OmKeyInfo omKeyInfo; private long openKeySessionID; private List parentKeyInfos; - private OmVolumeArgs omVolumeArgs; private OmBucketInfo omBucketInfo; public OMKeyCreateResponse(@Nonnull OMResponse omResponse, @Nonnull OmKeyInfo omKeyInfo, List parentKeyInfos, - long openKeySessionID, @Nonnull OmVolumeArgs omVolumeArgs, - @Nonnull OmBucketInfo omBucketInfo) { + long openKeySessionID, @Nonnull OmBucketInfo omBucketInfo) { super(omResponse); this.omKeyInfo = omKeyInfo; this.openKeySessionID = openKeySessionID; this.parentKeyInfos = parentKeyInfos; - this.omVolumeArgs = omVolumeArgs; this.omBucketInfo = omBucketInfo; } @@ -102,8 +98,8 @@ protected void addToDBBatch(OMMetadataManager omMetadataManager, // update bucket usedBytes. omMetadataManager.getBucketTable().putWithBatch(batchOperation, - omMetadataManager.getBucketKey(omVolumeArgs.getVolume(), - omBucketInfo.getBucketName()), omBucketInfo); + omMetadataManager.getBucketKey(omKeyInfo.getVolumeName(), + omKeyInfo.getBucketName()), omBucketInfo); } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java index e85670154074..58785c0cad23 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponse.java @@ -22,7 +22,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos .OMResponse; @@ -41,15 +40,13 @@ public class OMKeyDeleteResponse extends AbstractOMKeyDeleteResponse { private OmKeyInfo omKeyInfo; - private OmVolumeArgs omVolumeArgs; private OmBucketInfo omBucketInfo; public OMKeyDeleteResponse(@Nonnull OMResponse omResponse, @Nonnull OmKeyInfo omKeyInfo, boolean isRatisEnabled, - @Nonnull OmVolumeArgs omVolumeArgs, @Nonnull OmBucketInfo omBucketInfo) { + @Nonnull OmBucketInfo omBucketInfo) { super(omResponse, isRatisEnabled); this.omKeyInfo = omKeyInfo; - this.omVolumeArgs = omVolumeArgs; this.omBucketInfo = omBucketInfo; } @@ -75,7 +72,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, // update bucket usedBytes. omMetadataManager.getBucketTable().putWithBatch(batchOperation, - omMetadataManager.getBucketKey(omVolumeArgs.getVolume(), + omMetadataManager.getBucketKey(omBucketInfo.getVolumeName(), omBucketInfo.getBucketName()), omBucketInfo); } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java index 00a23fcbbc86..8a6a4a2a42b9 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java @@ -23,7 +23,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse; @@ -41,16 +40,13 @@ @CleanupTableInfo(cleanupTables = KEY_TABLE) public class OMKeysDeleteResponse extends AbstractOMKeyDeleteResponse { private List omKeyInfoList; - private OmVolumeArgs omVolumeArgs; private OmBucketInfo omBucketInfo; public OMKeysDeleteResponse(@Nonnull OMResponse omResponse, @Nonnull List keyDeleteList, - boolean isRatisEnabled, @Nonnull OmVolumeArgs omVolumeArgs, - @Nonnull OmBucketInfo omBucketInfo) { + boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo) { super(omResponse, isRatisEnabled); this.omKeyInfoList = keyDeleteList; - this.omVolumeArgs = omVolumeArgs; this.omBucketInfo = omBucketInfo; } @@ -91,7 +87,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, // update bucket usedBytes. omMetadataManager.getBucketTable().putWithBatch(batchOperation, - omMetadataManager.getBucketKey(omVolumeArgs.getVolume(), + omMetadataManager.getBucketKey(omBucketInfo.getVolumeName(), omBucketInfo.getBucketName()), omBucketInfo); } } \ No newline at end of file diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java index b11a7327306d..d641875f1591 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponse.java @@ -23,7 +23,6 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; @@ -52,18 +51,15 @@ public class S3MultipartUploadAbortResponse extends OMClientResponse { private String multipartKey; private OmMultipartKeyInfo omMultipartKeyInfo; private boolean isRatisEnabled; - private OmVolumeArgs omVolumeArgs; private OmBucketInfo omBucketInfo; public S3MultipartUploadAbortResponse(@Nonnull OMResponse omResponse, String multipartKey, @Nonnull OmMultipartKeyInfo omMultipartKeyInfo, - boolean isRatisEnabled, @Nonnull OmVolumeArgs omVolumeArgs, - @Nonnull OmBucketInfo omBucketInfo) { + boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo) { super(omResponse); this.multipartKey = multipartKey; this.omMultipartKeyInfo = omMultipartKeyInfo; this.isRatisEnabled = isRatisEnabled; - this.omVolumeArgs = omVolumeArgs; this.omBucketInfo = omBucketInfo; } @@ -106,7 +102,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, // update bucket usedBytes. omMetadataManager.getBucketTable().putWithBatch(batchOperation, - omMetadataManager.getBucketKey(omVolumeArgs.getVolume(), + omMetadataManager.getBucketKey(omBucketInfo.getVolumeName(), omBucketInfo.getBucketName()), omBucketInfo); } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java index 496175fc3822..c2b119b91624 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponse.java @@ -23,7 +23,6 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.apache.hadoop.ozone.om.response.CleanupTableInfo; import org.apache.hadoop.ozone.om.response.OMClientResponse; @@ -58,7 +57,6 @@ public class S3MultipartUploadCommitPartResponse extends OMClientResponse { private OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo; private OmKeyInfo openPartKeyInfoToBeDeleted; private boolean isRatisEnabled; - private OmVolumeArgs omVolumeArgs; private OmBucketInfo omBucketInfo; /** @@ -78,8 +76,7 @@ public S3MultipartUploadCommitPartResponse(@Nonnull OMResponse omResponse, @Nullable OmMultipartKeyInfo omMultipartKeyInfo, @Nullable OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo, @Nullable OmKeyInfo openPartKeyInfoToBeDeleted, - boolean isRatisEnabled, @Nonnull OmVolumeArgs omVolumeArgs, - @Nonnull OmBucketInfo omBucketInfo) { + boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo) { super(omResponse); this.multipartKey = multipartKey; this.openKey = openKey; @@ -87,7 +84,6 @@ public S3MultipartUploadCommitPartResponse(@Nonnull OMResponse omResponse, this.oldPartKeyInfo = oldPartKeyInfo; this.openPartKeyInfoToBeDeleted = openPartKeyInfoToBeDeleted; this.isRatisEnabled = isRatisEnabled; - this.omVolumeArgs = omVolumeArgs; this.omBucketInfo = omBucketInfo; } @@ -154,7 +150,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager, // update bucket usedBytes. omMetadataManager.getBucketTable().putWithBatch(batchOperation, - omMetadataManager.getBucketKey(omVolumeArgs.getVolume(), + omMetadataManager.getBucketKey(omBucketInfo.getVolumeName(), omBucketInfo.getBucketName()), omBucketInfo); } } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java index 494a308b28e1..602ec99f781b 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponse.java @@ -19,7 +19,6 @@ package org.apache.hadoop.ozone.om.response.key; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.util.Time; import org.junit.Assert; import org.junit.Test; @@ -40,9 +39,6 @@ public void testAddToDBBatch() throws Exception { OmKeyInfo omKeyInfo = TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName, replicationType, replicationFactor); - OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder() - .setOwnerName(keyName).setAdminName(keyName) - .setVolume(volumeName).setCreationTime(Time.now()).build(); OmBucketInfo omBucketInfo = OmBucketInfo.newBuilder() .setVolumeName(volumeName).setBucketName(bucketName) .setCreationTime(Time.now()).build(); @@ -55,7 +51,7 @@ public void testAddToDBBatch() throws Exception { .build(); OMAllocateBlockResponse omAllocateBlockResponse = new OMAllocateBlockResponse(omResponse, omKeyInfo, clientID, - omVolumeArgs, omBucketInfo); + omBucketInfo); String openKey = omMetadataManager.getOpenKey(volumeName, bucketName, keyName, clientID); @@ -74,9 +70,6 @@ public void testAddToDBBatch() throws Exception { public void testAddToDBBatchWithErrorResponse() throws Exception { OmKeyInfo omKeyInfo = TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName, replicationType, replicationFactor); - OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder() - .setOwnerName(keyName).setAdminName(keyName) - .setVolume(volumeName).setCreationTime(Time.now()).build(); OmBucketInfo omBucketInfo = OmBucketInfo.newBuilder() .setVolumeName(volumeName).setBucketName(bucketName) .setCreationTime(Time.now()).build(); @@ -89,7 +82,7 @@ public void testAddToDBBatchWithErrorResponse() throws Exception { .build(); OMAllocateBlockResponse omAllocateBlockResponse = new OMAllocateBlockResponse(omResponse, omKeyInfo, clientID, - omVolumeArgs, omBucketInfo); + omBucketInfo); // Before calling addToDBBatch String openKey = omMetadataManager.getOpenKey(volumeName, bucketName, diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java index ab425f2f60dc..5d2a3d8d741b 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java @@ -38,9 +38,6 @@ public void testAddToDBBatch() throws Exception { OmKeyInfo omKeyInfo = TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName, replicationType, replicationFactor); - OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder() - .setOwnerName(keyName).setAdminName(keyName) - .setVolume(volumeName).setCreationTime(Time.now()).build(); OmBucketInfo omBucketInfo = OmBucketInfo.newBuilder() .setVolumeName(volumeName).setBucketName(bucketName) .setCreationTime(Time.now()).build(); @@ -64,7 +61,7 @@ public void testAddToDBBatch() throws Exception { String ozoneKey = omMetadataManager.getOzoneKey(volumeName, bucketName, keyName); OMKeyCommitResponse omKeyCommitResponse = new OMKeyCommitResponse( - omResponse, omKeyInfo, ozoneKey, openKey, omVolumeArgs, omBucketInfo); + omResponse, omKeyInfo, ozoneKey, openKey, omBucketInfo); omKeyCommitResponse.addToDBBatch(omMetadataManager, batchOperation); @@ -102,7 +99,7 @@ public void testAddToDBBatchNoOp() throws Exception { keyName); OMKeyCommitResponse omKeyCommitResponse = new OMKeyCommitResponse( - omResponse, omKeyInfo, ozoneKey, openKey, omVolumeArgs, omBucketInfo); + omResponse, omKeyInfo, ozoneKey, openKey, omBucketInfo); // As during commit Key, entry will be already there in openKeyTable. // Adding it here. diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java index 6357000f7cf5..e3645ec8db72 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponse.java @@ -59,7 +59,7 @@ public void testAddToDBBatch() throws Exception { OMKeyCreateResponse omKeyCreateResponse = new OMKeyCreateResponse(omResponse, omKeyInfo, null, clientID, - omVolumeArgs, omBucketInfo); + omBucketInfo); String openKey = omMetadataManager.getOpenKey(volumeName, bucketName, keyName, clientID); @@ -77,9 +77,6 @@ public void testAddToDBBatchWithErrorResponse() throws Exception { OmKeyInfo omKeyInfo = TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName, replicationType, replicationFactor); - OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder() - .setOwnerName(keyName).setAdminName(keyName) - .setVolume(volumeName).setCreationTime(Time.now()).build(); OmBucketInfo omBucketInfo = OmBucketInfo.newBuilder() .setVolumeName(volumeName).setBucketName(bucketName) .setCreationTime(Time.now()).build(); @@ -92,7 +89,7 @@ public void testAddToDBBatchWithErrorResponse() throws Exception { OMKeyCreateResponse omKeyCreateResponse = new OMKeyCreateResponse(omResponse, omKeyInfo, null, clientID, - omVolumeArgs, omBucketInfo); + omBucketInfo); // Before calling addToDBBatch String openKey = omMetadataManager.getOpenKey(volumeName, bucketName, diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java index 440fa7837ebd..871e39f03d5c 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java @@ -60,7 +60,7 @@ public void testAddToDBBatch() throws Exception { .build(); OMKeyDeleteResponse omKeyDeleteResponse = new OMKeyDeleteResponse( - omResponse, omKeyInfo, true, omVolumeArgs, omBucketInfo); + omResponse, omKeyInfo, true, omBucketInfo); String ozoneKey = omMetadataManager.getOzoneKey(volumeName, bucketName, keyName); @@ -128,7 +128,7 @@ public void testAddToDBBatchWithNonEmptyBlocks() throws Exception { .build(); OMKeyDeleteResponse omKeyDeleteResponse = new OMKeyDeleteResponse( - omResponse, omKeyInfo, true, omVolumeArgs, omBucketInfo); + omResponse, omKeyInfo, true, omBucketInfo); Assert.assertTrue(omMetadataManager.getKeyTable().isExist(ozoneKey)); omKeyDeleteResponse.addToDBBatch(omMetadataManager, batchOperation); @@ -148,9 +148,7 @@ public void testAddToDBBatchWithNonEmptyBlocks() throws Exception { public void testAddToDBBatchWithErrorResponse() throws Exception { OmKeyInfo omKeyInfo = TestOMRequestUtils.createOmKeyInfo(volumeName, bucketName, keyName, replicationType, replicationFactor); - OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder() - .setOwnerName(keyName).setAdminName(keyName) - .setVolume(volumeName).setCreationTime(Time.now()).build(); + OmBucketInfo omBucketInfo = OmBucketInfo.newBuilder() .setVolumeName(volumeName).setBucketName(bucketName) .setCreationTime(Time.now()).build(); @@ -163,7 +161,7 @@ public void testAddToDBBatchWithErrorResponse() throws Exception { .build(); OMKeyDeleteResponse omKeyDeleteResponse = new OMKeyDeleteResponse( - omResponse, omKeyInfo, true, omVolumeArgs, omBucketInfo); + omResponse, omKeyInfo, true, omBucketInfo); String ozoneKey = omMetadataManager.getOzoneKey(volumeName, bucketName, keyName); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java index e1f68ba9abb7..8951a05040f1 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeysDeleteResponse.java @@ -85,8 +85,7 @@ public void testKeysDeleteResponse() throws Exception { .setCreationTime(Time.now()).build(); OMClientResponse omKeysDeleteResponse = new OMKeysDeleteResponse( - omResponse, omKeyInfoList, true, - omVolumeArgs, omBucketInfo); + omResponse, omKeyInfoList, true, omBucketInfo); omKeysDeleteResponse.checkAndUpdateDB(omMetadataManager, batchOperation); @@ -113,16 +112,12 @@ public void testKeysDeleteResponseFail() throws Exception { .setDeleteKeysResponse(DeleteKeysResponse.newBuilder() .setStatus(false)).build(); - OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder() - .setOwnerName(keyName).setAdminName(keyName) - .setVolume(volumeName).setCreationTime(Time.now()).build(); OmBucketInfo omBucketInfo = OmBucketInfo.newBuilder() .setVolumeName(volumeName).setBucketName(bucketName) .setCreationTime(Time.now()).build(); OMClientResponse omKeysDeleteResponse = new OMKeysDeleteResponse( - omResponse, omKeyInfoList, true, - omVolumeArgs, omBucketInfo); + omResponse, omKeyInfoList, true, omBucketInfo); omKeysDeleteResponse.checkAndUpdateDB(omMetadataManager, batchOperation); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java index d185d0b1dfb6..4f50d9e8cf7e 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartResponse.java @@ -24,7 +24,6 @@ import java.util.UUID; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -118,8 +117,7 @@ public S3InitiateMultipartUploadResponse createS3InitiateMPUResponse( } public S3MultipartUploadAbortResponse createS3AbortMPUResponse( - String multipartKey, long timeStamp, - OmMultipartKeyInfo omMultipartKeyInfo, OmVolumeArgs omVolumeArgs, + String multipartKey, OmMultipartKeyInfo omMultipartKeyInfo, OmBucketInfo omBucketInfo) { OMResponse omResponse = OMResponse.newBuilder() .setCmdType(OzoneManagerProtocolProtos.Type.AbortMultiPartUpload) @@ -129,7 +127,7 @@ public S3MultipartUploadAbortResponse createS3AbortMPUResponse( MultipartUploadAbortResponse.newBuilder().build()).build(); return new S3MultipartUploadAbortResponse(omResponse, multipartKey, - omMultipartKeyInfo, true, omVolumeArgs, omBucketInfo); + omMultipartKeyInfo, true, omBucketInfo); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponse.java index da030a9f143b..a11c4dbeed17 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponse.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponse.java @@ -21,7 +21,6 @@ import java.util.UUID; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; -import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.junit.Assert; import org.junit.Test; @@ -48,9 +47,7 @@ public void testAddDBToBatch() throws Exception { String multipartUploadID = UUID.randomUUID().toString(); String multipartKey = omMetadataManager.getMultipartKey(volumeName, bucketName, keyName, multipartUploadID); - OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder() - .setOwnerName(keyName).setAdminName(keyName) - .setVolume(volumeName).setCreationTime(Time.now()).build(); + OmBucketInfo omBucketInfo = OmBucketInfo.newBuilder() .setVolumeName(volumeName).setBucketName(bucketName) .setCreationTime(Time.now()).build(); @@ -62,9 +59,9 @@ public void testAddDBToBatch() throws Exception { batchOperation); S3MultipartUploadAbortResponse s3MultipartUploadAbortResponse = - createS3AbortMPUResponse(multipartKey, Time.now(), + createS3AbortMPUResponse(multipartKey, s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(), - omVolumeArgs, omBucketInfo); + omBucketInfo); s3MultipartUploadAbortResponse.addToDBBatch(omMetadataManager, batchOperation); @@ -89,9 +86,7 @@ public void testAddDBToBatchWithParts() throws Exception { String multipartUploadID = UUID.randomUUID().toString(); String multipartKey = omMetadataManager.getMultipartKey(volumeName, bucketName, keyName, multipartUploadID); - OmVolumeArgs omVolumeArgs = OmVolumeArgs.newBuilder() - .setOwnerName(keyName).setAdminName(keyName) - .setVolume(volumeName).setCreationTime(Time.now()).build(); + OmBucketInfo omBucketInfo = OmBucketInfo.newBuilder() .setVolumeName(volumeName).setBucketName(bucketName) .setCreationTime(Time.now()).build(); @@ -120,11 +115,10 @@ public void testAddDBToBatchWithParts() throws Exception { addPart(2, part2, omMultipartKeyInfo); - long timeStamp = Time.now(); S3MultipartUploadAbortResponse s3MultipartUploadAbortResponse = - createS3AbortMPUResponse(multipartKey, timeStamp, + createS3AbortMPUResponse(multipartKey, s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(), - omVolumeArgs, omBucketInfo); + omBucketInfo); s3MultipartUploadAbortResponse.addToDBBatch(omMetadataManager, batchOperation);