You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ra...@apache.org on 2021/12/15 03:22:04 UTC
[ozone] branch master updated: HDDS-6089. Remove OMClientResponse#getBucketLayout override in subclasses - part2 (#2915)
This is an automated email from the ASF dual-hosted git repository.
rakeshr 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 c4579ec HDDS-6089. Remove OMClientResponse#getBucketLayout override in subclasses - part2 (#2915)
c4579ec is described below
commit c4579ec5427758f6fa53b555b8de05a9d3f4d222
Author: Jyotinder Singh <jy...@gmail.com>
AuthorDate: Wed Dec 15 08:51:42 2021 +0530
HDDS-6089. Remove OMClientResponse#getBucketLayout override in subclasses - part2 (#2915)
---
.../om/request/file/OMDirectoryCreateRequest.java | 2 +-
.../file/OMDirectoryCreateRequestWithFSO.java | 2 +-
.../ozone/om/request/file/OMFileCreateRequest.java | 2 +-
.../request/file/OMFileCreateRequestWithFSO.java | 2 +-
.../om/request/key/OMAllocateBlockRequest.java | 4 +--
.../request/key/OMAllocateBlockRequestWithFSO.java | 4 +--
.../ozone/om/request/key/OMKeyCommitRequest.java | 2 +-
.../om/request/key/OMKeyCommitRequestWithFSO.java | 2 +-
.../ozone/om/request/key/OMKeyCreateRequest.java | 2 +-
.../om/request/key/OMKeyCreateRequestWithFSO.java | 2 +-
.../ozone/om/request/key/OMKeyDeleteRequest.java | 3 +-
.../om/request/key/OMKeyDeleteRequestWithFSO.java | 2 +-
.../ozone/om/request/key/OMKeyRenameRequest.java | 2 +-
.../om/request/key/OMKeyRenameRequestWithFSO.java | 2 +-
.../ozone/om/request/key/OMKeysDeleteRequest.java | 3 +-
.../om/request/key/OMPathsPurgeRequestWithFSO.java | 2 +-
.../ozone/om/request/key/acl/OMKeyAclRequest.java | 3 +-
.../om/request/key/acl/OMKeyAclRequestWithFSO.java | 2 +-
.../request/key/acl/OMKeyAddAclRequestWithFSO.java | 3 +-
.../key/acl/OMKeyRemoveAclRequestWithFSO.java | 3 +-
.../request/key/acl/OMKeySetAclRequestWithFSO.java | 3 +-
.../S3InitiateMultipartUploadRequest.java | 4 +--
.../S3InitiateMultipartUploadRequestWithFSO.java | 4 +--
.../multipart/S3MultipartUploadAbortRequest.java | 4 +--
.../S3MultipartUploadAbortRequestWithFSO.java | 4 +--
.../S3MultipartUploadCommitPartRequest.java | 2 +-
.../S3MultipartUploadCommitPartRequestWithFSO.java | 2 +-
.../S3MultipartUploadCompleteRequest.java | 5 +--
.../S3MultipartUploadCompleteRequestWithFSO.java | 5 +--
.../response/file/OMDirectoryCreateResponse.java | 10 +++---
.../file/OMDirectoryCreateResponseWithFSO.java | 15 ++++----
.../om/response/file/OMFileCreateResponse.java | 6 ++--
.../response/file/OMFileCreateResponseWithFSO.java | 5 +--
.../response/key/AbstractOMKeyDeleteResponse.java | 5 +--
.../om/response/key/OMAllocateBlockResponse.java | 13 +++----
.../key/OMAllocateBlockResponseWithFSO.java | 14 +++-----
.../ozone/om/response/key/OMKeyCommitResponse.java | 6 ++--
.../response/key/OMKeyCommitResponseWithFSO.java | 5 +--
.../ozone/om/response/key/OMKeyCreateResponse.java | 6 ++--
.../response/key/OMKeyCreateResponseWithFSO.java | 6 ++--
.../ozone/om/response/key/OMKeyDeleteResponse.java | 6 ++--
.../response/key/OMKeyDeleteResponseWithFSO.java | 5 +--
.../ozone/om/response/key/OMKeyPurgeResponse.java | 3 +-
.../ozone/om/response/key/OMKeyRenameResponse.java | 5 +--
.../response/key/OMKeyRenameResponseWithFSO.java | 5 +--
.../om/response/key/OMKeysDeleteResponse.java | 6 ++--
.../om/response/key/OMOpenKeysDeleteRequest.java | 2 +-
.../om/response/key/OMOpenKeysDeleteResponse.java | 6 ++--
.../response/key/OMPathsPurgeResponseWithFSO.java | 5 +--
.../ozone/om/response/key/OmKeyResponse.java | 25 --------------
.../om/response/key/acl/OMKeyAclResponse.java | 17 +++++++--
.../response/key/acl/OMKeyAclResponseWithFSO.java | 16 +++++----
.../S3InitiateMultipartUploadResponse.java | 14 ++++----
.../S3InitiateMultipartUploadResponseWithFSO.java | 10 +++---
.../multipart/S3MultipartUploadAbortResponse.java | 18 +++++-----
.../S3MultipartUploadAbortResponseWithFSO.java | 13 +++----
.../S3MultipartUploadCommitPartResponse.java | 14 ++++----
...S3MultipartUploadCommitPartResponseWithFSO.java | 9 ++---
.../S3MultipartUploadCompleteResponse.java | 40 +++++-----------------
.../S3MultipartUploadCompleteResponseWithFSO.java | 11 +++---
.../ozone/om/response/TestCleanupTableInfo.java | 7 ++--
.../file/TestOMDirectoryCreateResponse.java | 2 +-
.../file/TestOMDirectoryCreateResponseWithFSO.java | 4 ++-
.../response/key/TestOMAllocateBlockResponse.java | 2 +-
.../key/TestOMAllocateBlockResponseWithFSO.java | 2 +-
.../s3/multipart/TestS3MultipartResponse.java | 13 ++++---
.../TestS3MultipartUploadAbortResponseWithFSO.java | 6 ++--
67 files changed, 219 insertions(+), 220 deletions(-)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
index 6c2a862..e197cca 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
@@ -215,7 +215,7 @@ public class OMDirectoryCreateRequest extends OMKeyRequest {
Optional.of(missingParentInfos), trxnLogIndex);
result = Result.SUCCESS;
omClientResponse = new OMDirectoryCreateResponse(omResponse.build(),
- dirKeyInfo, missingParentInfos, result);
+ dirKeyInfo, missingParentInfos, result, getBucketLayout());
} else {
// omDirectoryResult == DIRECTORY_EXITS
result = Result.DIRECTORY_ALREADY_EXISTS;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
index ba41e6d..0f90b6c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
@@ -169,7 +169,7 @@ public class OMDirectoryCreateRequestWithFSO extends OMDirectoryCreateRequest {
result = OMDirectoryCreateRequest.Result.SUCCESS;
omClientResponse =
new OMDirectoryCreateResponseWithFSO(omResponse.build(), dirInfo,
- missingParentInfos, result);
+ missingParentInfos, result, getBucketLayout());
} else {
result = Result.DIRECTORY_ALREADY_EXISTS;
omResponse.setStatus(Status.DIRECTORY_ALREADY_EXISTS);
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 6a9f9c2..6cff6ec 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
@@ -315,7 +315,7 @@ public class OMFileCreateRequest extends OMKeyRequest {
omMetrics.incNumCreateFileFails();
omResponse.setCmdType(CreateFile);
omClientResponse = new OMFileCreateResponse(createErrorOMResponse(
- omResponse, exception));
+ omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
index 988c87d..56e27fe 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
@@ -230,7 +230,7 @@ public class OMFileCreateRequestWithFSO extends OMFileCreateRequest {
omMetrics.incNumCreateFileFails();
omResponse.setCmdType(Type.CreateFile);
omClientResponse = new OMFileCreateResponseWithFSO(createErrorOMResponse(
- omResponse, exception));
+ omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
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 ad18b8f..ea4192c 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
@@ -227,7 +227,7 @@ public class OMAllocateBlockRequest extends OMKeyRequest {
omResponse.setAllocateBlockResponse(AllocateBlockResponse.newBuilder()
.setKeyLocation(blockLocation).build());
omClientResponse = new OMAllocateBlockResponse(omResponse.build(),
- openKeyInfo, clientID, omBucketInfo.copyObject());
+ openKeyInfo, clientID, omBucketInfo.copyObject(), getBucketLayout());
LOG.debug("Allocated block for Volume:{}, Bucket:{}, OpenKey:{}",
volumeName, bucketName, openKeyName);
@@ -235,7 +235,7 @@ public class OMAllocateBlockRequest extends OMKeyRequest {
omMetrics.incNumBlockAllocateCallFails();
exception = ex;
omClientResponse = new OMAllocateBlockResponse(createErrorOMResponse(
- omResponse, exception));
+ omResponse, exception), getBucketLayout());
LOG.error("Allocate Block failed. Volume:{}, Bucket:{}, OpenKey:{}. " +
"Exception:{}", volumeName, bucketName, openKeyName, exception);
} finally {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
index 3f3a581..05c2b01 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
@@ -169,7 +169,7 @@ public class OMAllocateBlockRequestWithFSO extends OMAllocateBlockRequest {
omMetrics.incNumBlockAllocateCallFails();
exception = ex;
omClientResponse = new OMAllocateBlockResponseWithFSO(
- createErrorOMResponse(omResponse, exception));
+ createErrorOMResponse(omResponse, exception), getBucketLayout());
LOG.error("Allocate Block failed. Volume:{}, Bucket:{}, OpenKey:{}. " +
"Exception:{}", volumeName, bucketName, openKeyName, exception);
} finally {
@@ -223,6 +223,6 @@ public class OMAllocateBlockRequestWithFSO extends OMAllocateBlockRequest {
OMResponse.Builder omResponse, OmKeyInfo openKeyInfo,
OmBucketInfo omBucketInfo) {
return new OMAllocateBlockResponseWithFSO(omResponse.build(), openKeyInfo,
- clientID, omBucketInfo);
+ clientID, omBucketInfo, getBucketLayout());
}
}
\ No newline at end of file
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 b0dd2b7..9a2ac61 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
@@ -260,7 +260,7 @@ public class OMKeyCommitRequest extends OMKeyRequest {
result = Result.FAILURE;
exception = ex;
omClientResponse = new OMKeyCommitResponse(createErrorOMResponse(
- omResponse, exception));
+ omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
index e10fcde..f662390 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
@@ -193,7 +193,7 @@ public class OMKeyCommitRequestWithFSO extends OMKeyCommitRequest {
result = Result.FAILURE;
exception = ex;
omClientResponse = new OMKeyCommitResponseWithFSO(createErrorOMResponse(
- omResponse, exception));
+ omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
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 5b5f9a3..4fd0ded 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
@@ -334,7 +334,7 @@ public class OMKeyCreateRequest extends OMKeyRequest {
omMetrics.incNumKeyAllocateFails();
omResponse.setCmdType(Type.CreateKey);
omClientResponse = new OMKeyCreateResponse(
- createErrorOMResponse(omResponse, exception));
+ createErrorOMResponse(omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
index e5db152..6aa79de 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
@@ -212,7 +212,7 @@ public class OMKeyCreateRequestWithFSO extends OMKeyCreateRequest {
omMetrics.incNumKeyAllocateFails();
omResponse.setCmdType(Type.CreateKey);
omClientResponse = new OMKeyCreateResponseWithFSO(
- createErrorOMResponse(omResponse, exception));
+ createErrorOMResponse(omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
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 cfbf251..0cdeb9f 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
@@ -178,7 +178,8 @@ public class OMKeyDeleteRequest extends OMKeyRequest {
result = Result.FAILURE;
exception = ex;
omClientResponse =
- new OMKeyDeleteResponse(createErrorOMResponse(omResponse, exception));
+ new OMKeyDeleteResponse(createErrorOMResponse(omResponse, exception),
+ getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
index 027f641..f621cc1 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
@@ -171,7 +171,7 @@ public class OMKeyDeleteRequestWithFSO extends OMKeyDeleteRequest {
result = Result.FAILURE;
exception = ex;
omClientResponse = new OMKeyDeleteResponseWithFSO(
- createErrorOMResponse(omResponse, exception));
+ createErrorOMResponse(omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
index b723950..99ca308 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
@@ -207,7 +207,7 @@ public class OMKeyRenameRequest extends OMKeyRequest {
result = Result.FAILURE;
exception = ex;
omClientResponse = new OMKeyRenameResponse(createErrorOMResponse(
- omResponse, exception));
+ omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
index abd164b..2235baf 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
@@ -210,7 +210,7 @@ public class OMKeyRenameRequestWithFSO extends OMKeyRenameRequest {
result = Result.FAILURE;
exception = ex;
omClientResponse = new OMKeyRenameResponseWithFSO(createErrorOMResponse(
- omResponse, exception));
+ omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
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 fb684b0..59d8773 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
@@ -195,7 +195,8 @@ public class OMKeysDeleteRequest extends OMKeyRequest {
omResponse.setDeleteKeysResponse(DeleteKeysResponse.newBuilder()
.setStatus(false).setUnDeletedKeys(unDeletedKeys).build()).build();
- omClientResponse = new OMKeysDeleteResponse(omResponse.build());
+ omClientResponse =
+ new OMKeysDeleteResponse(omResponse.build(), getBucketLayout());
} finally {
if (acquiredLock) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
index 5f04f66..e1cd0f0 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
@@ -56,7 +56,7 @@ public class OMPathsPurgeRequestWithFSO extends OMKeyRequest {
OMClientResponse omClientResponse = new OMPathsPurgeResponseWithFSO(
omResponse.build(), markDeletedSubDirsList, deletedSubFilesList,
- deletedDirsList, ozoneManager.isRatisEnabled());
+ deletedDirsList, ozoneManager.isRatisEnabled(), getBucketLayout());
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
index f294f94..4a45ef9 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequest.java
@@ -221,7 +221,8 @@ public abstract class OMKeyAclRequest extends OMClientRequest {
*/
OMClientResponse onFailure(OMResponse.Builder omResponse,
IOException exception) {
- return new OMKeyAclResponse(createErrorOMResponse(omResponse, exception));
+ return new OMKeyAclResponse(createErrorOMResponse(omResponse, exception),
+ getBucketLayout());
}
/**
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
index 5725aa1..5068f89 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAclRequestWithFSO.java
@@ -161,7 +161,7 @@ public abstract class OMKeyAclRequestWithFSO extends OMKeyAclRequest {
OzoneManagerProtocolProtos.OMResponse.Builder omResp,
IOException exception) {
return new OMKeyAclResponseWithFSO(
- createErrorOMResponse(omResp, exception));
+ createErrorOMResponse(omResp, exception), getBucketLayout());
}
abstract OMClientResponse onSuccess(
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
index 552360a..fe5737f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequestWithFSO.java
@@ -147,6 +147,7 @@ public class OMKeyAddAclRequestWithFSO extends OMKeyAclRequestWithFSO {
omResponse.setAddAclResponse(
OzoneManagerProtocolProtos.AddAclResponse.newBuilder()
.setResponse(operationResult));
- return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir);
+ return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir,
+ getBucketLayout());
}
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
index 9095133..323343f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequestWithFSO.java
@@ -158,6 +158,7 @@ public class OMKeyRemoveAclRequestWithFSO extends OMKeyAclRequestWithFSO {
omResponse.setRemoveAclResponse(
OzoneManagerProtocolProtos.RemoveAclResponse.newBuilder()
.setResponse(operationResult));
- return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir);
+ return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir,
+ getBucketLayout());
}
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
index 3602d4a..474b59a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequestWithFSO.java
@@ -151,6 +151,7 @@ public class OMKeySetAclRequestWithFSO extends OMKeyAclRequestWithFSO {
omResponse.setSetAclResponse(
OzoneManagerProtocolProtos.SetAclResponse.newBuilder()
.setResponse(operationResult));
- return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir);
+ return new OMKeyAclResponseWithFSO(omResponse.build(), omKeyInfo, isDir,
+ getBucketLayout());
}
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequest.java
index 151564c..63f9747 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequest.java
@@ -220,14 +220,14 @@ public class S3InitiateMultipartUploadRequest extends OMKeyRequest {
.setBucketName(requestedBucket)
.setKeyName(keyName)
.setMultipartUploadID(keyArgs.getMultipartUploadID()))
- .build(), multipartKeyInfo, omKeyInfo);
+ .build(), multipartKeyInfo, omKeyInfo, getBucketLayout());
result = Result.SUCCESS;
} catch (IOException ex) {
result = Result.FAILURE;
exception = ex;
omClientResponse = new S3InitiateMultipartUploadResponse(
- createErrorOMResponse(omResponse, exception));
+ createErrorOMResponse(omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(transactionLogIndex, omClientResponse,
ozoneManagerDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
index b6b7464..1ef6ed2 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
@@ -214,14 +214,14 @@ public class S3InitiateMultipartUploadRequestWithFSO
.setKeyName(keyName)
.setMultipartUploadID(keyArgs.getMultipartUploadID()))
.build(), multipartKeyInfo, omKeyInfo, multipartKey,
- missingParentInfos);
+ missingParentInfos, getBucketLayout());
result = Result.SUCCESS;
} catch (IOException ex) {
result = Result.FAILURE;
exception = ex;
omClientResponse = new S3InitiateMultipartUploadResponseWithFSO(
- createErrorOMResponse(omResponse, exception));
+ createErrorOMResponse(omResponse, exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(transactionLogIndex, omClientResponse,
ozoneManagerDoubleBufferHelper);
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 d6a6282..21d10c4 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
@@ -232,7 +232,7 @@ public class S3MultipartUploadAbortRequest extends OMKeyRequest {
OMResponse.Builder omResponse) {
return new S3MultipartUploadAbortResponse(createErrorOMResponse(omResponse,
- exception));
+ exception), getBucketLayout());
}
protected OMClientResponse getOmClientResponse(OzoneManager ozoneManager,
@@ -244,7 +244,7 @@ public class S3MultipartUploadAbortRequest extends OMKeyRequest {
omResponse.setAbortMultiPartUploadResponse(
MultipartUploadAbortResponse.newBuilder()).build(), multipartKey,
multipartOpenKey, multipartKeyInfo, ozoneManager.isRatisEnabled(),
- omBucketInfo.copyObject());
+ omBucketInfo.copyObject(), getBucketLayout());
return omClientResponse;
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
index 25fd681..62999cf 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
@@ -52,7 +52,7 @@ public class S3MultipartUploadAbortRequestWithFSO
OMResponse.Builder omResponse) {
return new S3MultipartUploadAbortResponseWithFSO(createErrorOMResponse(
- omResponse, exception));
+ omResponse, exception), getBucketLayout());
}
@Override
@@ -65,7 +65,7 @@ public class S3MultipartUploadAbortRequestWithFSO
omResponse.setAbortMultiPartUploadResponse(
MultipartUploadAbortResponse.newBuilder()).build(), multipartKey,
multipartOpenKey, multipartKeyInfo, ozoneManager.isRatisEnabled(),
- omBucketInfo.copyObject());
+ omBucketInfo.copyObject(), getBucketLayout());
return omClientResp;
}
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 2f56ddb..717be05 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
@@ -281,7 +281,7 @@ public class S3MultipartUploadCommitPartRequest extends OMKeyRequest {
return new S3MultipartUploadCommitPartResponse(build, multipartKey, openKey,
multipartKeyInfo, oldPartKeyInfo, omKeyInfo,
- ozoneManager.isRatisEnabled(), omBucketInfo);
+ ozoneManager.isRatisEnabled(), omBucketInfo, getBucketLayout());
}
protected OmKeyInfo getOmKeyInfo(OMMetadataManager omMetadataManager,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
index deec30d..4b30068 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
@@ -83,6 +83,6 @@ public class S3MultipartUploadCommitPartRequestWithFSO
return new S3MultipartUploadCommitPartResponseWithFSO(build, multipartKey,
openKey, multipartKeyInfo, oldPartKeyInfo, omKeyInfo,
- ozoneManager.isRatisEnabled(), omBucketInfo);
+ ozoneManager.isRatisEnabled(), omBucketInfo, getBucketLayout());
}
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
index f26aba8..873e18c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequest.java
@@ -249,7 +249,7 @@ public class S3MultipartUploadCompleteRequest extends OMKeyRequest {
protected S3MultipartUploadCompleteResponse getOmClientResponse(
OMResponse.Builder omResponse, IOException exception) {
return new S3MultipartUploadCompleteResponse(
- createErrorOMResponse(omResponse, exception));
+ createErrorOMResponse(omResponse, exception), getBucketLayout());
}
protected OMClientResponse getOmClientResponse(String multipartKey,
@@ -257,7 +257,8 @@ public class S3MultipartUploadCompleteRequest extends OMKeyRequest {
OmKeyInfo omKeyInfo, List<OmKeyInfo> unUsedParts) {
return new S3MultipartUploadCompleteResponse(omResponse.build(),
- multipartKey, dbMultipartOpenKey, omKeyInfo, unUsedParts);
+ multipartKey, dbMultipartOpenKey, omKeyInfo, unUsedParts,
+ getBucketLayout());
}
protected void checkDirectoryAlreadyExists(OzoneManager ozoneManager,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
index ed0bc63..9b43652 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
@@ -143,7 +143,7 @@ public class S3MultipartUploadCompleteRequestWithFSO
IOException exception) {
return new S3MultipartUploadCompleteResponseWithFSO(
- createErrorOMResponse(omResponse, exception));
+ createErrorOMResponse(omResponse, exception), getBucketLayout());
}
@Override
@@ -153,7 +153,8 @@ public class S3MultipartUploadCompleteRequestWithFSO
List<OmKeyInfo> unUsedParts) {
return new S3MultipartUploadCompleteResponseWithFSO(omResponse.build(),
- multipartKey, dbMultipartOpenKey, omKeyInfo, unUsedParts);
+ multipartKey, dbMultipartOpenKey, omKeyInfo, unUsedParts,
+ getBucketLayout());
}
private long getParentId(OMMetadataManager omMetadataManager,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java
index a5e5f8f..da770ed 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponse.java
@@ -19,11 +19,12 @@
package org.apache.hadoop.ozone.om.response.file;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequest.Result;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.key.OmKeyResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.OMResponse;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
@@ -40,7 +41,7 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.KEY_TABLE;
* Response for create directory request.
*/
@CleanupTableInfo(cleanupTables = {KEY_TABLE})
-public class OMDirectoryCreateResponse extends OMClientResponse {
+public class OMDirectoryCreateResponse extends OmKeyResponse {
public static final Logger LOG =
LoggerFactory.getLogger(OMDirectoryCreateResponse.class);
@@ -51,8 +52,9 @@ public class OMDirectoryCreateResponse extends OMClientResponse {
public OMDirectoryCreateResponse(@Nonnull OMResponse omResponse,
@Nonnull OmKeyInfo dirKeyInfo,
- @Nonnull List<OmKeyInfo> parentKeyInfos, @Nonnull Result result) {
- super(omResponse);
+ @Nonnull List<OmKeyInfo> parentKeyInfos, @Nonnull Result result,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
this.dirKeyInfo = dirKeyInfo;
this.parentKeyInfos = parentKeyInfos;
this.result = result;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java
index be5275f..f136227 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMDirectoryCreateResponseWithFSO.java
@@ -20,10 +20,11 @@ package org.apache.hadoop.ozone.om.response.file;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequest.Result;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.key.OmKeyResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +39,7 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
* Response for create directory request.
*/
@CleanupTableInfo(cleanupTables = {DIRECTORY_TABLE})
-public class OMDirectoryCreateResponseWithFSO extends OMClientResponse {
+public class OMDirectoryCreateResponseWithFSO extends OmKeyResponse {
public static final Logger LOG =
LoggerFactory.getLogger(OMDirectoryCreateResponseWithFSO.class);
@@ -48,10 +49,12 @@ public class OMDirectoryCreateResponseWithFSO extends OMClientResponse {
private Result result;
public OMDirectoryCreateResponseWithFSO(@Nonnull OMResponse omResponse,
- @Nonnull OmDirectoryInfo dirInfo,
- @Nonnull List<OmDirectoryInfo> pDirInfos,
- @Nonnull Result result) {
- super(omResponse);
+ @Nonnull OmDirectoryInfo dirInfo,
+ @Nonnull
+ List<OmDirectoryInfo> pDirInfos,
+ @Nonnull Result result, @Nonnull
+ BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
this.dirInfo = dirInfo;
this.parentDirInfos = pDirInfos;
this.result = result;
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 8b60dc2..02e62a0 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
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.response.file;
import javax.annotation.Nonnull;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
@@ -50,8 +51,9 @@ public class OMFileCreateResponse extends OMKeyCreateResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMFileCreateResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMFileCreateResponse(@Nonnull OMResponse omResponse, @Nonnull
+ BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java
index 89757bd..de57a40 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/file/OMFileCreateResponseWithFSO.java
@@ -58,8 +58,9 @@ public class OMFileCreateResponseWithFSO extends OMFileCreateResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMFileCreateResponseWithFSO(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMFileCreateResponseWithFSO(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
@Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java
index e859d96..0fecb22 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/AbstractOMKeyDeleteResponse.java
@@ -63,8 +63,9 @@ public abstract class AbstractOMKeyDeleteResponse extends OmKeyResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public AbstractOMKeyDeleteResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public AbstractOMKeyDeleteResponse(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
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 3e8cd96..b2bf3c6 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
@@ -19,10 +19,10 @@
package org.apache.hadoop.ozone.om.response.key;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
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;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
@@ -36,7 +36,7 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_KEY_TABLE;
* Response for AllocateBlock request.
*/
@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE})
-public class OMAllocateBlockResponse extends OMClientResponse {
+public class OMAllocateBlockResponse extends OmKeyResponse {
private OmKeyInfo omKeyInfo;
private long clientID;
@@ -44,8 +44,8 @@ public class OMAllocateBlockResponse extends OMClientResponse {
public OMAllocateBlockResponse(@Nonnull OMResponse omResponse,
@Nonnull OmKeyInfo omKeyInfo, long clientID,
- @Nonnull OmBucketInfo omBucketInfo) {
- super(omResponse);
+ @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
this.omKeyInfo = omKeyInfo;
this.clientID = clientID;
this.omBucketInfo = omBucketInfo;
@@ -55,8 +55,9 @@ public class OMAllocateBlockResponse extends OMClientResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMAllocateBlockResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMAllocateBlockResponse(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java
index 82e4985..cc79954 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMAllocateBlockResponseWithFSO.java
@@ -40,21 +40,17 @@ public class OMAllocateBlockResponseWithFSO extends OMAllocateBlockResponse {
public OMAllocateBlockResponseWithFSO(@Nonnull OMResponse omResponse,
@Nonnull OmKeyInfo omKeyInfo, long clientID,
- @Nonnull OmBucketInfo omBucketInfo) {
- super(omResponse, omKeyInfo, clientID, omBucketInfo);
- }
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
+ @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, omKeyInfo, clientID, omBucketInfo, bucketLayout);
}
/**
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMAllocateBlockResponseWithFSO(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMAllocateBlockResponseWithFSO(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
@Override
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 39e0b7d..48154f9 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
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.response.key;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
@@ -60,8 +61,9 @@ public class OMKeyCommitResponse extends OmKeyResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMKeyCommitResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeyCommitResponse(@Nonnull OMResponse omResponse, @Nonnull
+ BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java
index ecc9fd1..61ea1e9 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCommitResponseWithFSO.java
@@ -55,8 +55,9 @@ public class OMKeyCommitResponseWithFSO extends OMKeyCommitResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMKeyCommitResponseWithFSO(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeyCommitResponseWithFSO(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
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 a22b02d..a4224cb 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
@@ -23,6 +23,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
@@ -62,8 +63,9 @@ public class OMKeyCreateResponse extends OmKeyResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMKeyCreateResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeyCreateResponse(@Nonnull OMResponse omResponse, @Nonnull
+ BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java
index f9f9567..d224ee1 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyCreateResponseWithFSO.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.response.key;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
@@ -50,7 +51,8 @@ public class OMKeyCreateResponseWithFSO extends OMFileCreateResponseWithFSO {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMKeyCreateResponseWithFSO(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeyCreateResponseWithFSO(@Nonnull OMResponse omResponse, @Nonnull
+ BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
}
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 d5a8d7c..4b9c6b7 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
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.response.key;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
@@ -54,8 +55,9 @@ public class OMKeyDeleteResponse extends AbstractOMKeyDeleteResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMKeyDeleteResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeyDeleteResponse(@Nonnull OMResponse omResponse, @Nonnull
+ BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
@Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java
index 2c003d8..dc408c3 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyDeleteResponseWithFSO.java
@@ -58,8 +58,9 @@ public class OMKeyDeleteResponseWithFSO extends OMKeyDeleteResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMKeyDeleteResponseWithFSO(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeyDeleteResponseWithFSO(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
@Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java
index 01b7457..b20a5d5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyPurgeResponse.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.om.response.key;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
import org.apache.hadoop.ozone.om.request.key.OMKeyPurgeRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
@@ -35,7 +34,7 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DELETED_TABLE;
* Response for {@link OMKeyPurgeRequest} request.
*/
@CleanupTableInfo(cleanupTables = {DELETED_TABLE})
-public class OMKeyPurgeResponse extends OMClientResponse {
+public class OMKeyPurgeResponse extends OmKeyResponse {
private List<String> purgeKeyList;
public OMKeyPurgeResponse(@Nonnull OMResponse omResponse,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java
index 6999c18..b5cc494 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponse.java
@@ -62,8 +62,9 @@ public class OMKeyRenameResponse extends OmKeyResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMKeyRenameResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeyRenameResponse(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java
index 0a938d1..0c592a2 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeyRenameResponseWithFSO.java
@@ -51,8 +51,9 @@ public class OMKeyRenameResponseWithFSO extends OMKeyRenameResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public OMKeyRenameResponseWithFSO(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeyRenameResponseWithFSO(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
@Override
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 6c6f1cc..020cb74 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
@@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.om.response.key;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
@@ -54,8 +55,9 @@ public class OMKeysDeleteResponse extends AbstractOMKeyDeleteResponse {
* For when the request is not successful or it is a replay transaction.
* For a successful request, the other constructor should be used.
*/
- public OMKeysDeleteResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public OMKeysDeleteResponse(@Nonnull OMResponse omResponse, @Nonnull
+ BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
@Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java
index c322fc2..d945ae5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java
@@ -105,7 +105,7 @@ public class OMOpenKeysDeleteRequest extends OMKeyRequest {
exception = ex;
omClientResponse =
new OMOpenKeysDeleteResponse(createErrorOMResponse(omResponse,
- exception));
+ exception), getBucketLayout());
} finally {
addResponseToDoubleBuffer(trxnLogIndex, omClientResponse,
omDoubleBufferHelper);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java
index cd6eb7f..177548e 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteResponse.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.response.key;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
@@ -53,9 +54,10 @@ public class OMOpenKeysDeleteResponse extends AbstractOMKeyDeleteResponse {
* For a successful request, the other constructor should be used.
*/
public OMOpenKeysDeleteResponse(
- @Nonnull OzoneManagerProtocolProtos.OMResponse omResponse) {
+ @Nonnull OzoneManagerProtocolProtos.OMResponse omResponse, @Nonnull
+ BucketLayout bucketLayout) {
- super(omResponse);
+ super(omResponse, bucketLayout);
}
@Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseWithFSO.java
index 4270b97..c487ca0 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMPathsPurgeResponseWithFSO.java
@@ -58,8 +58,9 @@ public class OMPathsPurgeResponseWithFSO extends OmKeyResponse {
public OMPathsPurgeResponseWithFSO(@Nonnull OMResponse omResponse,
@Nonnull List<OzoneManagerProtocolProtos.KeyInfo> markDeletedDirs,
@Nonnull List<OzoneManagerProtocolProtos.KeyInfo> files,
- @Nonnull List<String> dirs, boolean isRatisEnabled) {
- super(omResponse, BucketLayout.FILE_SYSTEM_OPTIMIZED);
+ @Nonnull List<String> dirs, boolean isRatisEnabled,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
this.markDeletedDirList = markDeletedDirs;
this.dirList = dirs;
this.fileList = files;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OmKeyResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OmKeyResponse.java
index cc2e735..0fc5d25 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OmKeyResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OmKeyResponse.java
@@ -19,14 +19,8 @@
package org.apache.hadoop.ozone.om.response.key;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.response.OMClientResponse;
-import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
/**
* OmKeyResponse.
@@ -35,9 +29,6 @@ public abstract class OmKeyResponse extends OMClientResponse {
private BucketLayout bucketLayout;
- private static final Logger LOG =
- LoggerFactory.getLogger(OmKeyResponse.class);
-
public OmKeyResponse(OzoneManagerProtocolProtos.OMResponse omResponse,
BucketLayout bucketLayoutArg) {
super(omResponse);
@@ -52,20 +43,4 @@ public abstract class OmKeyResponse extends OMClientResponse {
public BucketLayout getBucketLayout() {
return bucketLayout;
}
-
- protected BucketLayout getBucketLayout(OMMetadataManager omMetadataManager,
- String volName, String buckName) {
- if (omMetadataManager == null) {
- return BucketLayout.DEFAULT;
- }
- String buckKey = omMetadataManager.getBucketKey(volName, buckName);
- try {
- OmBucketInfo buckInfo = omMetadataManager.getBucketTable().get(buckKey);
- return buckInfo.getBucketLayout();
- } catch (IOException e) {
- LOG.error("Cannot find the key: " + buckKey, e);
- // Todo: Handle Exception
- }
- return BucketLayout.DEFAULT;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponse.java
index f0fb3da..3290905 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponse.java
@@ -23,9 +23,10 @@ import java.io.IOException;
import javax.annotation.Nonnull;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.key.OmKeyResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.OMResponse;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
@@ -36,7 +37,7 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.KEY_TABLE;
* Response for Bucket acl request.
*/
@CleanupTableInfo(cleanupTables = KEY_TABLE)
-public class OMKeyAclResponse extends OMClientResponse {
+public class OMKeyAclResponse extends OmKeyResponse {
private OmKeyInfo omKeyInfo;
@@ -46,6 +47,13 @@ public class OMKeyAclResponse extends OMClientResponse {
this.omKeyInfo = omKeyInfo;
}
+ public OMKeyAclResponse(@Nonnull OMResponse omResponse,
+ @Nonnull OmKeyInfo omKeyInfo,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
+ this.omKeyInfo = omKeyInfo;
+ }
+
/**
* For when the request is not successful.
* For a successful request, the other constructor should be used.
@@ -54,6 +62,11 @@ public class OMKeyAclResponse extends OMClientResponse {
super(omResponse);
}
+ public OMKeyAclResponse(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
+ }
+
@Override
public void addToDBBatch(OMMetadataManager omMetadataManager,
BatchOperation batchOperation) throws IOException {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java
index 7b69639..e5f24a8 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/acl/OMKeyAclResponseWithFSO.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.ozone.om.response.key.acl;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
@@ -26,6 +27,7 @@ import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.jetbrains.annotations.NotNull;
+import javax.annotation.Nonnull;
import java.io.IOException;
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.DIRECTORY_TABLE;
@@ -41,8 +43,9 @@ public class OMKeyAclResponseWithFSO extends OMKeyAclResponse {
public OMKeyAclResponseWithFSO(
@NotNull OzoneManagerProtocolProtos.OMResponse omResponse,
- @NotNull OmKeyInfo omKeyInfo, boolean isDirectory) {
- super(omResponse, omKeyInfo);
+ @NotNull OmKeyInfo omKeyInfo, boolean isDirectory,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, omKeyInfo, bucketLayout);
this.isDirectory = isDirectory;
}
@@ -53,8 +56,9 @@ public class OMKeyAclResponseWithFSO extends OMKeyAclResponse {
* @param omResponse
*/
public OMKeyAclResponseWithFSO(
- @NotNull OzoneManagerProtocolProtos.OMResponse omResponse) {
- super(omResponse);
+ @NotNull OzoneManagerProtocolProtos.OMResponse omResponse,
+ BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
@Override public void addToDBBatch(OMMetadataManager omMetadataManager,
@@ -68,9 +72,7 @@ public class OMKeyAclResponseWithFSO extends OMKeyAclResponse {
omMetadataManager.getDirectoryTable()
.putWithBatch(batchOperation, ozoneDbKey, dirInfo);
} else {
- omMetadataManager.getKeyTable(
- getBucketLayout(omMetadataManager, getOmKeyInfo().getVolumeName(),
- getOmKeyInfo().getBucketName()))
+ omMetadataManager.getKeyTable(getBucketLayout())
.putWithBatch(batchOperation, ozoneDbKey, getOmKeyInfo());
}
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponse.java
index e69b9ea..4d4fca5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponse.java
@@ -21,10 +21,11 @@ package org.apache.hadoop.ozone.om.response.s3.multipart;
import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.key.OmKeyResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
@@ -38,15 +39,15 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_KEY_TABLE;
* Response for S3 Initiate Multipart Upload request.
*/
@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, MULTIPARTINFO_TABLE})
-public class S3InitiateMultipartUploadResponse extends OMClientResponse {
+public class S3InitiateMultipartUploadResponse extends OmKeyResponse {
private OmMultipartKeyInfo omMultipartKeyInfo;
private OmKeyInfo omKeyInfo;
public S3InitiateMultipartUploadResponse(
@Nonnull OMResponse omResponse,
@Nonnull OmMultipartKeyInfo omMultipartKeyInfo,
- @Nonnull OmKeyInfo omKeyInfo) {
- super(omResponse);
+ @Nonnull OmKeyInfo omKeyInfo, @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
this.omMultipartKeyInfo = omMultipartKeyInfo;
this.omKeyInfo = omKeyInfo;
}
@@ -55,8 +56,9 @@ public class S3InitiateMultipartUploadResponse extends OMClientResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public S3InitiateMultipartUploadResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public S3InitiateMultipartUploadResponse(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
index c655c47..250706d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.om.response.s3.multipart;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo;
@@ -50,8 +51,9 @@ public class S3InitiateMultipartUploadResponseWithFSO extends
@Nonnull OMResponse omResponse,
@Nonnull OmMultipartKeyInfo omMultipartKeyInfo,
@Nonnull OmKeyInfo omKeyInfo, @Nonnull String mpuDBKey,
- @Nonnull List<OmDirectoryInfo> parentDirInfos) {
- super(omResponse, omMultipartKeyInfo, omKeyInfo);
+ @Nonnull List<OmDirectoryInfo> parentDirInfos,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, omMultipartKeyInfo, omKeyInfo, bucketLayout);
this.parentDirInfos = parentDirInfos;
this.mpuDBKey = mpuDBKey;
}
@@ -61,8 +63,8 @@ public class S3InitiateMultipartUploadResponseWithFSO extends
* For a successful request, the other constructor should be used.
*/
public S3InitiateMultipartUploadResponseWithFSO(
- @Nonnull OMResponse omResponse) {
- super(omResponse);
+ @Nonnull OMResponse omResponse, @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
@Override
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 99ef98c..291e09c 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
@@ -20,12 +20,9 @@ package org.apache.hadoop.ozone.om.response.s3.multipart;
import org.apache.hadoop.ozone.OmUtils;
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.RepeatedOmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.*;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.key.OmKeyResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.OMResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
@@ -46,7 +43,7 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_KEY_TABLE;
*/
@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, DELETED_TABLE,
MULTIPARTINFO_TABLE})
-public class S3MultipartUploadAbortResponse extends OMClientResponse {
+public class S3MultipartUploadAbortResponse extends OmKeyResponse {
private String multipartKey;
private String multipartOpenKey;
@@ -57,8 +54,8 @@ public class S3MultipartUploadAbortResponse extends OMClientResponse {
public S3MultipartUploadAbortResponse(@Nonnull OMResponse omResponse,
String multipartKey, String multipartOpenKey,
@Nonnull OmMultipartKeyInfo omMultipartKeyInfo, boolean isRatisEnabled,
- @Nonnull OmBucketInfo omBucketInfo) {
- super(omResponse);
+ @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
this.multipartKey = multipartKey;
this.multipartOpenKey = multipartOpenKey;
this.omMultipartKeyInfo = omMultipartKeyInfo;
@@ -70,8 +67,9 @@ public class S3MultipartUploadAbortResponse extends OMClientResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public S3MultipartUploadAbortResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public S3MultipartUploadAbortResponse(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java
index a970d68..7ddb2ce 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadAbortResponseWithFSO.java
@@ -41,10 +41,10 @@ public class S3MultipartUploadAbortResponseWithFSO
public S3MultipartUploadAbortResponseWithFSO(@Nonnull OMResponse omResponse,
String multipartKey, String multipartOpenKey,
@Nonnull OmMultipartKeyInfo omMultipartKeyInfo, boolean isRatisEnabled,
- @Nonnull OmBucketInfo omBucketInfo) {
+ @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) {
super(omResponse, multipartKey, multipartOpenKey, omMultipartKeyInfo,
- isRatisEnabled, omBucketInfo);
+ isRatisEnabled, omBucketInfo, bucketLayout);
}
/**
@@ -52,12 +52,7 @@ public class S3MultipartUploadAbortResponseWithFSO
* For a successful request, the other constructor should be used.
*/
public S3MultipartUploadAbortResponseWithFSO(
- @Nonnull OMResponse omResponse) {
- super(omResponse);
- }
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
+ @Nonnull OMResponse omResponse, @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
}
}
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 0947e04..ad42e8d 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
@@ -20,12 +20,9 @@ package org.apache.hadoop.ozone.om.response.s3.multipart;
import org.apache.hadoop.ozone.OmUtils;
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.RepeatedOmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.*;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.key.OmKeyResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.OMResponse;
@@ -49,7 +46,7 @@ import javax.annotation.Nullable;
*/
@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, DELETED_TABLE,
MULTIPARTINFO_TABLE})
-public class S3MultipartUploadCommitPartResponse extends OMClientResponse {
+public class S3MultipartUploadCommitPartResponse extends OmKeyResponse {
private String multipartKey;
private String openKey;
@@ -79,8 +76,9 @@ public class S3MultipartUploadCommitPartResponse extends OMClientResponse {
@Nullable OmMultipartKeyInfo omMultipartKeyInfo,
@Nullable OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo,
@Nullable OmKeyInfo openPartKeyInfoToBeDeleted,
- boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo) {
- super(omResponse);
+ boolean isRatisEnabled, @Nonnull OmBucketInfo omBucketInfo,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
this.multipartKey = multipartKey;
this.openKey = openKey;
this.omMultipartKeyInfo = omMultipartKeyInfo;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java
index 8fb8153..e8979c7 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCommitPartResponseWithFSO.java
@@ -61,15 +61,10 @@ public class S3MultipartUploadCommitPartResponseWithFSO
@Nullable OmMultipartKeyInfo omMultipartKeyInfo,
@Nullable OzoneManagerProtocolProtos.PartKeyInfo oldPartKeyInfo,
@Nullable OmKeyInfo openPartKeyInfoToBeDeleted, boolean isRatisEnabled,
- @Nonnull OmBucketInfo omBucketInfo) {
+ @Nonnull OmBucketInfo omBucketInfo, @Nonnull BucketLayout bucketLayout) {
super(omResponse, multipartKey, openKey, omMultipartKeyInfo,
oldPartKeyInfo, openPartKeyInfoToBeDeleted, isRatisEnabled,
- omBucketInfo);
- }
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
+ omBucketInfo, bucketLayout);
}
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java
index a9bcaf92..c5c24c3 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponse.java
@@ -23,15 +23,13 @@ import java.util.List;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
-import org.apache.hadoop.ozone.om.response.OMClientResponse;
+import org.apache.hadoop.ozone.om.response.key.OmKeyResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.OMResponse;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
-import static org.apache.hadoop.ozone.om.OzoneManager.LOG;
import javax.annotation.Nonnull;
@@ -50,7 +48,7 @@ import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.OPEN_KEY_TABLE;
*/
@CleanupTableInfo(cleanupTables = {OPEN_KEY_TABLE, KEY_TABLE, DELETED_TABLE,
MULTIPARTINFO_TABLE})
-public class S3MultipartUploadCompleteResponse extends OMClientResponse {
+public class S3MultipartUploadCompleteResponse extends OmKeyResponse {
private String multipartKey;
private String multipartOpenKey;
private OmKeyInfo omKeyInfo;
@@ -61,8 +59,9 @@ public class S3MultipartUploadCompleteResponse extends OMClientResponse {
@Nonnull String multipartKey,
@Nonnull String multipartOpenKey,
@Nonnull OmKeyInfo omKeyInfo,
- @Nonnull List<OmKeyInfo> unUsedParts) {
- super(omResponse);
+ @Nonnull List<OmKeyInfo> unUsedParts,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
this.partsUnusedList = unUsedParts;
this.multipartKey = multipartKey;
this.multipartOpenKey = multipartOpenKey;
@@ -73,8 +72,9 @@ public class S3MultipartUploadCompleteResponse extends OMClientResponse {
* For when the request is not successful.
* For a successful request, the other constructor should be used.
*/
- public S3MultipartUploadCompleteResponse(@Nonnull OMResponse omResponse) {
- super(omResponse);
+ public S3MultipartUploadCompleteResponse(@Nonnull OMResponse omResponse,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
@@ -114,9 +114,7 @@ public class S3MultipartUploadCompleteResponse extends OMClientResponse {
String ozoneKey = omMetadataManager.getOzoneKey(omKeyInfo.getVolumeName(),
omKeyInfo.getBucketName(), omKeyInfo.getKeyName());
- omMetadataManager.getKeyTable(
- getBucketLayout(omMetadataManager, omKeyInfo.getVolumeName(),
- omKeyInfo.getBucketName()))
+ omMetadataManager.getKeyTable(getBucketLayout())
.putWithBatch(batchOperation, ozoneKey, omKeyInfo);
return ozoneKey;
}
@@ -133,24 +131,4 @@ public class S3MultipartUploadCompleteResponse extends OMClientResponse {
return partsUnusedList;
}
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
-
- public BucketLayout getBucketLayout(OMMetadataManager omMetadataManager,
- String volName, String buckName) {
- if (omMetadataManager == null) {
- return BucketLayout.DEFAULT;
- }
- String buckKey = omMetadataManager.getBucketKey(volName, buckName);
- try {
- OmBucketInfo buckInfo = omMetadataManager.getBucketTable().get(buckKey);
- return buckInfo.getBucketLayout();
- } catch (IOException e) {
- LOG.error("Cannot find the key: " + buckKey);
- }
- return BucketLayout.DEFAULT;
- }
-
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java
index 6776165..9092540 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3MultipartUploadCompleteResponseWithFSO.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.ozone.om.response.s3.multipart;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
import org.apache.hadoop.ozone.om.response.CleanupTableInfo;
@@ -52,8 +53,10 @@ public class S3MultipartUploadCompleteResponseWithFSO
@Nonnull String multipartKey,
@Nonnull String multipartOpenKey,
@Nonnull OmKeyInfo omKeyInfo,
- @Nonnull List<OmKeyInfo> unUsedParts) {
- super(omResponse, multipartKey, multipartOpenKey, omKeyInfo, unUsedParts);
+ @Nonnull List<OmKeyInfo> unUsedParts,
+ @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, multipartKey, multipartOpenKey, omKeyInfo, unUsedParts,
+ bucketLayout);
}
/**
@@ -61,8 +64,8 @@ public class S3MultipartUploadCompleteResponseWithFSO
* For a successful request, the other constructor should be used.
*/
public S3MultipartUploadCompleteResponseWithFSO(
- @Nonnull OMResponse omResponse) {
- super(omResponse);
+ @Nonnull OMResponse omResponse, @Nonnull BucketLayout bucketLayout) {
+ super(omResponse, bucketLayout);
checkStatusNotOK();
}
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestCleanupTableInfo.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestCleanupTableInfo.java
index 3217cba..230360b 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestCleanupTableInfo.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/TestCleanupTableInfo.java
@@ -43,6 +43,7 @@ import org.apache.hadoop.ozone.om.request.file.OMFileCreateRequest;
import org.apache.hadoop.ozone.om.request.key.OMKeyCreateRequest;
import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponse;
import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponse;
+import org.apache.hadoop.ozone.om.response.key.OmKeyResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateFileRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.CreateKeyRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.KeyArgs;
@@ -53,7 +54,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.Ignore;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -140,14 +140,15 @@ public class TestCleanupTableInfo {
}
@Test
- @Ignore("HDDS-6089.")
public void checkAnnotationAndTableName() {
OMMetadataManager omMetadataManager = om.getMetadataManager();
Set<String> tables = omMetadataManager.listTableNames();
Set<Class<? extends OMClientResponse>> subTypes = responseClasses();
+ // OmKeyResponse is an abstract class that does not need CleanupTable.
+ subTypes.remove(OmKeyResponse.class);
subTypes.forEach(aClass -> {
- Assert.assertTrue(aClass + "does not have annotation of" +
+ Assert.assertTrue(aClass + " does not have annotation of" +
" CleanupTableInfo",
aClass.isAnnotationPresent(CleanupTableInfo.class));
CleanupTableInfo annotation =
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponse.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponse.java
index b0e4c26..33d8c81 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponse.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponse.java
@@ -87,7 +87,7 @@ public class TestOMDirectoryCreateResponse {
OMDirectoryCreateResponse omDirectoryCreateResponse =
new OMDirectoryCreateResponse(omResponse, omKeyInfo,
- new ArrayList<>(), Result.SUCCESS);
+ new ArrayList<>(), Result.SUCCESS, getBucketLayout());
omDirectoryCreateResponse.addToDBBatch(omMetadataManager, batchOperation);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
index 628ac65..1562fd1 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMDirectoryCreateResponseWithFSO.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestWithFSO;
@@ -73,7 +74,8 @@ public class TestOMDirectoryCreateResponseWithFSO {
OMDirectoryCreateResponseWithFSO omDirectoryCreateResponseWithFSO =
new OMDirectoryCreateResponseWithFSO(omResponse, omDirInfo,
- new ArrayList<>(), OMDirectoryCreateRequestWithFSO.Result.SUCCESS);
+ new ArrayList<>(), OMDirectoryCreateRequestWithFSO.Result.SUCCESS,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
omDirectoryCreateResponseWithFSO
.addToDBBatch(omMetadataManager, batchOperation);
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 f0bade3..71dd7db 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
@@ -113,6 +113,6 @@ public class TestOMAllocateBlockResponse extends TestOMKeyResponse {
OmKeyInfo omKeyInfo, OmBucketInfo omBucketInfo,
OMResponse omResponse) {
return new OMAllocateBlockResponse(omResponse, omKeyInfo, clientID,
- omBucketInfo);
+ omBucketInfo, getBucketLayout());
}
}
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
index 5fef60b..bbbacae 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
@@ -67,7 +67,7 @@ public class TestOMAllocateBlockResponseWithFSO
OmKeyInfo omKeyInfo, OmBucketInfo omBucketInfo,
OMResponse omResponse) {
return new OMAllocateBlockResponseWithFSO(omResponse, omKeyInfo, clientID,
- omBucketInfo);
+ omBucketInfo, getBucketLayout());
}
@Override
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 c869738..9a79ce9 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
@@ -219,7 +219,7 @@ public class TestS3MultipartResponse {
keyName, multipartUploadID);
return new S3InitiateMultipartUploadResponseWithFSO(omResponse,
- multipartKeyInfo, omKeyInfo, mpuKey, parentDirInfos);
+ multipartKeyInfo, omKeyInfo, mpuKey, parentDirInfos, getBucketLayout());
}
@SuppressWarnings("checkstyle:ParameterNumber")
@@ -272,7 +272,8 @@ public class TestS3MultipartResponse {
return new S3MultipartUploadCommitPartResponseWithFSO(omResponse,
multipartKey, openKey, multipartKeyInfo, oldPartKeyInfo,
- openPartKeyInfoToBeDeleted, isRatisEnabled, omBucketInfo);
+ openPartKeyInfoToBeDeleted, isRatisEnabled, omBucketInfo,
+ getBucketLayout());
}
@SuppressWarnings("checkstyle:ParameterNumber")
@@ -298,7 +299,8 @@ public class TestS3MultipartResponse {
.setVolume(volumeName).setKey(keyName)).build();
return new S3MultipartUploadCompleteResponseWithFSO(omResponse,
- multipartKey, multipartOpenKey, omKeyInfo, unUsedParts);
+ multipartKey, multipartOpenKey, omKeyInfo, unUsedParts,
+ getBucketLayout());
}
private String getMultipartKey(long parentID, String keyName,
@@ -312,7 +314,7 @@ public class TestS3MultipartResponse {
OmMultipartKeyInfo multipartKeyInfo, OmKeyInfo omKeyInfo,
OMResponse omResponse) {
return new S3InitiateMultipartUploadResponse(omResponse, multipartKeyInfo,
- omKeyInfo);
+ omKeyInfo, getBucketLayout());
}
protected S3MultipartUploadAbortResponse getS3MultipartUploadAbortResp(
@@ -320,7 +322,8 @@ public class TestS3MultipartResponse {
OmMultipartKeyInfo omMultipartKeyInfo, OmBucketInfo omBucketInfo,
OMResponse omResponse) {
return new S3MultipartUploadAbortResponse(omResponse, multipartKey,
- multipartOpenKey, omMultipartKeyInfo, true, omBucketInfo);
+ multipartOpenKey, omMultipartKeyInfo, true, omBucketInfo,
+ getBucketLayout());
}
public BucketLayout getBucketLayout() {
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java
index 41a089e..3605f7f 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadAbortResponseWithFSO.java
@@ -62,7 +62,8 @@ public class TestS3MultipartUploadAbortResponseWithFSO
multipartKeyInfo.getUploadID());
return new S3InitiateMultipartUploadResponseWithFSO(omResponse,
- multipartKeyInfo, omKeyInfo, mpuDBKey, new ArrayList<>());
+ multipartKeyInfo, omKeyInfo, mpuDBKey, new ArrayList<>(),
+ getBucketLayout());
}
@Override
@@ -71,7 +72,8 @@ public class TestS3MultipartUploadAbortResponseWithFSO
OmMultipartKeyInfo omMultipartKeyInfo, OmBucketInfo omBucketInfo,
OzoneManagerProtocolProtos.OMResponse omResponse) {
return new S3MultipartUploadAbortResponseWithFSO(omResponse, multipartKey,
- multipartOpenKey, omMultipartKeyInfo, true, omBucketInfo);
+ multipartOpenKey, omMultipartKeyInfo, true, omBucketInfo,
+ getBucketLayout());
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org