This is an automated email from the ASF dual-hosted git repository.
captainzmc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new e0ce757 HDDS-4581. Cleanup usage of volumeArgs in KeyRequests. (#1693)
e0ce757 is described below
commit e0ce757e63888dadabead74dbfc3da0e040e3824
Author: Bharat Viswanadham <[email protected]>
AuthorDate: Mon Dec 14 03:04:55 2020 -0800
HDDS-4581. Cleanup usage of volumeArgs in KeyRequests. (#1693)
* HDDS-4581. Cleanup usage of volumeArgs in KeyRequests.
---
.../ozone/om/request/file/OMFileCreateRequest.java | 6 +-----
.../om/request/key/OMAllocateBlockRequest.java | 6 +-----
.../ozone/om/request/key/OMKeyCommitRequest.java | 6 +-----
.../ozone/om/request/key/OMKeyCreateRequest.java | 6 +-----
.../ozone/om/request/key/OMKeyDeleteRequest.java | 5 +----
.../hadoop/ozone/om/request/key/OMKeyRequest.java | 25 ----------------------
.../ozone/om/request/key/OMKeysDeleteRequest.java | 5 +----
.../multipart/S3MultipartUploadAbortRequest.java | 5 +----
.../S3MultipartUploadCommitPartRequest.java | 7 ++----
.../om/response/file/OMFileCreateResponse.java | 5 ++---
.../om/response/key/OMAllocateBlockResponse.java | 9 +++-----
.../ozone/om/response/key/OMKeyCommitResponse.java | 7 ++----
.../ozone/om/response/key/OMKeyCreateResponse.java | 10 +++------
.../ozone/om/response/key/OMKeyDeleteResponse.java | 7 ++----
.../om/response/key/OMKeysDeleteResponse.java | 8 ++-----
.../multipart/S3MultipartUploadAbortResponse.java | 8 ++-----
.../S3MultipartUploadCommitPartResponse.java | 8 ++-----
.../response/key/TestOMAllocateBlockResponse.java | 11 ++--------
.../om/response/key/TestOMKeyCommitResponse.java | 7 ++----
.../om/response/key/TestOMKeyCreateResponse.java | 7 ++----
.../om/response/key/TestOMKeyDeleteResponse.java | 10 ++++-----
.../om/response/key/TestOMKeysDeleteResponse.java | 9 ++------
.../s3/multipart/TestS3MultipartResponse.java | 6 ++----
.../TestS3MultipartUploadAbortResponse.java | 18 ++++++----------
24 files changed, 47 insertions(+), 154 deletions(-)
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 fee31a2..4917595 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.OmUtils;
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 class OMFileCreateRequest extends OMKeyRequest {
boolean acquiredLock = false;
OmKeyInfo omKeyInfo = null;
- OmVolumeArgs omVolumeArgs = null;
OmBucketInfo omBucketInfo = null;
final List<OmKeyLocationInfo> locations = new ArrayList<>();
List<OmKeyInfo> missingParentInfos;
@@ -279,7 +277,6 @@ public class OMFileCreateRequest extends OMKeyRequest {
.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 class OMFileCreateRequest extends OMKeyRequest {
.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 1fd4b07..c70be2f 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 java.util.Map;
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 class OMAllocateBlockRequest extends OMKeyRequest {
OmKeyInfo openKeyInfo = null;
IOException exception = null;
- OmVolumeArgs omVolumeArgs = null;
OmBucketInfo omBucketInfo = null;
boolean acquiredLock = false;
@@ -196,7 +194,6 @@ public class OMAllocateBlockRequest extends OMKeyRequest {
List<OmKeyLocationInfo> newLocationList = Collections.singletonList(
OmKeyLocationInfo.getFromProtobuf(blockLocation));
- omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName);
acquiredLock = omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
volumeName, bucketName);
@@ -221,11 +218,10 @@ public class OMAllocateBlockRequest extends OMKeyRequest {
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 c914bc0..b3ec69f 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.OmUtils;
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 class OMKeyCommitRequest extends OMKeyRequest {
IOException exception = null;
OmKeyInfo omKeyInfo = null;
- OmVolumeArgs omVolumeArgs = null;
OmBucketInfo omBucketInfo = null;
OMClientResponse omClientResponse = null;
boolean bucketLockAcquired = false;
@@ -193,7 +191,6 @@ public class OMKeyCommitRequest extends OMKeyRequest {
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 class OMKeyCommitRequest extends OMKeyRequest {
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 88ade80..70bf060 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.OmUtils;
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 class OMKeyCreateRequest extends OMKeyRequest {
OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
OmKeyInfo omKeyInfo = null;
- OmVolumeArgs omVolumeArgs = null;
OmBucketInfo omBucketInfo = null;
final List< OmKeyLocationInfo > locations = new ArrayList<>();
@@ -288,7 +286,6 @@ public class OMKeyCreateRequest extends OMKeyRequest {
.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 class OMKeyCreateRequest extends OMKeyRequest {
.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 a99c02b..593dcec 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 java.util.Map;
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 class OMKeyDeleteRequest extends OMKeyRequest {
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 class OMKeyDeleteRequest extends OMKeyRequest {
keyName)),
new CacheValue<>(Optional.absent(), trxnLogIndex));
- omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName);
omBucketInfo = getBucketInfo(omMetadataManager, volumeName, bucketName);
long quotaReleased = sumBlockLengths(omKeyInfo);
@@ -156,7 +153,7 @@ public class OMKeyDeleteRequest extends OMKeyRequest {
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 553f7f0..fccc662 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 java.util.Map;
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;
@@ -610,30 +609,6 @@ public abstract class OMKeyRequest extends OMClientRequest
{
}
/**
- * 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<OmVolumeArgs> 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}.
*/
protected static long sumBlockLengths(OmKeyInfo 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 3dc22e8..0798e3e 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.OzoneManager;
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 class OMKeysDeleteRequest extends OMKeyRequest {
}
long quotaReleased = 0;
- OmVolumeArgs omVolumeArgs = getVolumeInfo(omMetadataManager, volumeName);
OmBucketInfo omBucketInfo =
getBucketInfo(omMetadataManager, volumeName, bucketName);
@@ -177,8 +175,7 @@ public class OMKeysDeleteRequest extends OMKeyRequest {
.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 42dc85d..e7773cf 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 java.util.Map;
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 class S3MultipartUploadAbortRequest extends
OMKeyRequest {
getOmRequest());
OMClientResponse omClientResponse = null;
Result result = null;
- OmVolumeArgs omVolumeArgs = null;
OmBucketInfo omBucketInfo = null;
try {
keyArgs = resolveBucketLink(ozoneManager, keyArgs, auditMap);
@@ -125,7 +123,6 @@ public class S3MultipartUploadAbortRequest extends
OMKeyRequest {
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 class S3MultipartUploadAbortRequest extends
OMKeyRequest {
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 78c8623..78436cc 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.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.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 class S3MultipartUploadCommitPartRequest extends
OMKeyRequest {
String multipartKey = null;
OmMultipartKeyInfo multipartKeyInfo = null;
Result result = null;
- OmVolumeArgs omVolumeArgs = null;
OmBucketInfo omBucketInfo = null;
OmBucketInfo copyBucketInfo = null;
try {
@@ -214,7 +212,6 @@ public class S3MultipartUploadCommitPartRequest extends
OMKeyRequest {
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 class S3MultipartUploadCommitPartRequest extends
OMKeyRequest {
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 class S3MultipartUploadCommitPartRequest extends
OMKeyRequest {
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 de490c5..8b60dc2 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 javax.annotation.Nonnull;
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<OmKeyInfo> 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 acc43ee..4b20853 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 @@ package org.apache.hadoop.ozone.om.response.key;
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 class OMAllocateBlockResponse extends OMClientResponse
{
// 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 8e2f6dc..5d43b27 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 @@ package org.apache.hadoop.ozone.om.response.key;
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 class OMKeyCommitResponse extends OMClientResponse {
// 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 60f6bfe..98b1927 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 javax.annotation.Nonnull;
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<OmKeyInfo> parentKeyInfos;
- private OmVolumeArgs omVolumeArgs;
private OmBucketInfo omBucketInfo;
public OMKeyCreateResponse(@Nonnull OMResponse omResponse,
@Nonnull OmKeyInfo omKeyInfo, List<OmKeyInfo> 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 @@ public class OMKeyCreateResponse extends OMClientResponse {
// 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 e856701..58785c0 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.hdds.utils.db.Table;
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 @@ import static
org.apache.hadoop.ozone.om.OmMetadataManagerImpl.KEY_TABLE;
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 class OMKeyDeleteResponse extends
AbstractOMKeyDeleteResponse {
// 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 00a23fc..8a6a4a2 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.hdds.utils.db.Table;
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 @@ import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.
@CleanupTableInfo(cleanupTables = KEY_TABLE)
public class OMKeysDeleteResponse extends AbstractOMKeyDeleteResponse {
private List<OmKeyInfo> omKeyInfoList;
- private OmVolumeArgs omVolumeArgs;
private OmBucketInfo omBucketInfo;
public OMKeysDeleteResponse(@Nonnull OMResponse omResponse,
@Nonnull List<OmKeyInfo> 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 class OMKeysDeleteResponse extends
AbstractOMKeyDeleteResponse {
// 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 b11a732..d641875 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.OMMetadataManager;
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 class S3MultipartUploadAbortResponse extends
OMClientResponse {
// 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 496175f..c2b119b 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.OMMetadataManager;
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 class S3MultipartUploadCommitPartResponse extends
OMClientResponse {
@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 class S3MultipartUploadCommitPartResponse extends
OMClientResponse {
this.oldPartKeyInfo = oldPartKeyInfo;
this.openPartKeyInfoToBeDeleted = openPartKeyInfoToBeDeleted;
this.isRatisEnabled = isRatisEnabled;
- this.omVolumeArgs = omVolumeArgs;
this.omBucketInfo = omBucketInfo;
}
@@ -154,7 +150,7 @@ public class S3MultipartUploadCommitPartResponse extends
OMClientResponse {
// 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 494a308..602ec99 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 class TestOMAllocateBlockResponse extends
TestOMKeyResponse {
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 class TestOMAllocateBlockResponse extends
TestOMKeyResponse {
.build();
OMAllocateBlockResponse omAllocateBlockResponse =
new OMAllocateBlockResponse(omResponse, omKeyInfo, clientID,
- omVolumeArgs, omBucketInfo);
+ omBucketInfo);
String openKey = omMetadataManager.getOpenKey(volumeName, bucketName,
keyName, clientID);
@@ -74,9 +70,6 @@ public class TestOMAllocateBlockResponse extends
TestOMKeyResponse {
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 class TestOMAllocateBlockResponse extends
TestOMKeyResponse {
.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 ab425f2..5d2a3d8 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 class TestOMKeyCommitResponse extends
TestOMKeyResponse {
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 class TestOMKeyCommitResponse extends
TestOMKeyResponse {
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 class TestOMKeyCommitResponse extends
TestOMKeyResponse {
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 6357000..e3645ec 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 class TestOMKeyCreateResponse extends
TestOMKeyResponse {
OMKeyCreateResponse omKeyCreateResponse =
new OMKeyCreateResponse(omResponse, omKeyInfo, null, clientID,
- omVolumeArgs, omBucketInfo);
+ omBucketInfo);
String openKey = omMetadataManager.getOpenKey(volumeName, bucketName,
keyName, clientID);
@@ -77,9 +77,6 @@ public class TestOMKeyCreateResponse extends
TestOMKeyResponse {
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 class TestOMKeyCreateResponse extends
TestOMKeyResponse {
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 440fa78..871e39f 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 class TestOMKeyDeleteResponse extends
TestOMKeyResponse {
.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 class TestOMKeyDeleteResponse extends
TestOMKeyResponse {
.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 class TestOMKeyDeleteResponse extends
TestOMKeyResponse {
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 class TestOMKeyDeleteResponse extends
TestOMKeyResponse {
.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 e1f68ba..8951a05 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 class TestOMKeysDeleteResponse extends
TestOMKeyResponse {
.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 class TestOMKeysDeleteResponse extends
TestOMKeyResponse {
.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 d185d0b..4f50d9e 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.Collections;
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 class TestS3MultipartResponse {
}
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 class TestS3MultipartResponse {
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 da030a9..a11c4db 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 @@ package org.apache.hadoop.ozone.om.response.s3.multipart;
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 class TestS3MultipartUploadAbortResponse
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 class TestS3MultipartUploadAbortResponse
batchOperation);
S3MultipartUploadAbortResponse s3MultipartUploadAbortResponse =
- createS3AbortMPUResponse(multipartKey, Time.now(),
+ createS3AbortMPUResponse(multipartKey,
s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(),
- omVolumeArgs, omBucketInfo);
+ omBucketInfo);
s3MultipartUploadAbortResponse.addToDBBatch(omMetadataManager,
batchOperation);
@@ -89,9 +86,7 @@ public class TestS3MultipartUploadAbortResponse
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 class TestS3MultipartUploadAbortResponse
addPart(2, part2, omMultipartKeyInfo);
- long timeStamp = Time.now();
S3MultipartUploadAbortResponse s3MultipartUploadAbortResponse =
- createS3AbortMPUResponse(multipartKey, timeStamp,
+ createS3AbortMPUResponse(multipartKey,
s3InitiateMultipartUploadResponse.getOmMultipartKeyInfo(),
- omVolumeArgs, omBucketInfo);
+ omBucketInfo);
s3MultipartUploadAbortResponse.addToDBBatch(omMetadataManager,
batchOperation);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
