This is an automated email from the ASF dual-hosted git repository.
sumitagrawal 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 4d8de8f930 HDDS-9335. OMKeyDeleteRequest using the wrong bucket layout
(#5341)
4d8de8f930 is described below
commit 4d8de8f93030d53246c831359a0c45404b516d3b
Author: hao guo <[email protected]>
AuthorDate: Mon Oct 16 16:01:37 2023 +0800
HDDS-9335. OMKeyDeleteRequest using the wrong bucket layout (#5341)
---
.../apache/hadoop/ozone/om/request/key/OMKeyDeleteRequest.java | 9 +--------
.../hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java | 6 ++----
2 files changed, 3 insertions(+), 12 deletions(-)
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 f9e61f85d4..87214cd87b 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
@@ -94,13 +94,6 @@ public class OMKeyDeleteRequest extends OMKeyRequest {
@SuppressWarnings("methodlength")
public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
long trxnLogIndex, OzoneManagerDoubleBufferHelper omDoubleBufferHelper) {
- return validateAndUpdateCache(ozoneManager, trxnLogIndex,
- omDoubleBufferHelper, BucketLayout.DEFAULT);
- }
-
- public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
- long trxnLogIndex, OzoneManagerDoubleBufferHelper omDoubleBufferHelper,
- BucketLayout bucketLayout) {
DeleteKeyRequest deleteKeyRequest = getOmRequest().getDeleteKeyRequest();
OzoneManagerProtocolProtos.KeyArgs keyArgs = deleteKeyRequest.getKeyArgs();
@@ -143,7 +136,7 @@ public class OMKeyDeleteRequest extends OMKeyRequest {
validateBucketAndVolume(omMetadataManager, volumeName, bucketName);
OmKeyInfo omKeyInfo =
- omMetadataManager.getKeyTable(bucketLayout).get(objectKey);
+ omMetadataManager.getKeyTable(getBucketLayout()).get(objectKey);
if (omKeyInfo == null) {
throw new OMException("Key not found", KEY_NOT_FOUND);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java
index 03f246753d..8636742a15 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java
@@ -110,8 +110,7 @@ public class TestOMKeyDeleteRequest extends
TestOMKeyRequest {
OMClientResponse omClientResponse = omKeyDeleteRequest
.validateAndUpdateCache(ozoneManager, 100L,
- ozoneManagerDoubleBufferHelper,
- omKeyDeleteRequest.getBucketLayout());
+ ozoneManagerDoubleBufferHelper);
Assert.assertEquals(OzoneManagerProtocolProtos.Status.VOLUME_NOT_FOUND,
omClientResponse.getOMResponse().getStatus());
@@ -129,8 +128,7 @@ public class TestOMKeyDeleteRequest extends
TestOMKeyRequest {
OMClientResponse omClientResponse = omKeyDeleteRequest
.validateAndUpdateCache(ozoneManager, 100L,
- ozoneManagerDoubleBufferHelper,
- omKeyDeleteRequest.getBucketLayout());
+ ozoneManagerDoubleBufferHelper);
Assert.assertEquals(OzoneManagerProtocolProtos.Status.BUCKET_NOT_FOUND,
omClientResponse.getOMResponse().getStatus());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
