From f05e9d6cb2bb46ec050f5c511f6300674a8212ca Mon Sep 17 00:00:00 2001 From: wangzhaohui8 Date: Tue, 20 Jul 2021 11:57:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?HDDS-5465.=20Delete=20redundant=20code=20wh?= =?UTF-8?q?en=20set=E3=80=81add=20and=20remove=20bucket=20acl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ozone/om/request/bucket/acl/OMBucketAclRequest.java | 8 ++++++-- .../om/request/bucket/acl/OMBucketAddAclRequest.java | 7 ++++--- .../om/request/bucket/acl/OMBucketRemoveAclRequest.java | 7 ++++--- .../om/request/bucket/acl/OMBucketSetAclRequest.java | 3 +-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java index f1a504f185bd..167d012aab5c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java @@ -33,6 +33,7 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper; import org.apache.hadoop.ozone.om.request.OMClientRequest; +import org.apache.hadoop.ozone.om.response.bucket.acl.OMBucketAclResponse; import org.apache.hadoop.ozone.util.BooleanBiFunction; import org.apache.hadoop.ozone.om.request.util.ObjectParser; import org.apache.hadoop.ozone.om.response.OMClientResponse; @@ -204,8 +205,11 @@ abstract OMClientResponse onSuccess( * @param exception * @return OMClientResponse */ - abstract OMClientResponse onFailure(OMResponse.Builder omResponse, - IOException exception); + OMClientResponse onFailure(OMResponse.Builder omResponse, + IOException exception) { + return new OMBucketAclResponse( + createErrorOMResponse(omResponse, exception)); + } /** * Completion hook for final processing before return without lock. diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java index e0cddf337207..4ecb67e0501c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java @@ -122,8 +122,7 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse, @Override OMClientResponse onFailure(OMResponse.Builder omResponse, IOException exception) { - return new OMBucketAclResponse( - createErrorOMResponse(omResponse, exception)); + return super.onFailure(omResponse, exception); } @Override @@ -134,7 +133,9 @@ void onComplete(boolean operationResult, IOException exception, exception, getOmRequest().getUserInfo())); if (operationResult) { - LOG.debug("Add acl: {} to path: {} success!", getAcls(), getPath()); + if (LOG.isDebugEnabled()) { + LOG.debug("Add acl: {} to path: {} success!", getAcls(), getPath()); + } } else { omMetrics.incNumBucketUpdateFails(); if (exception == null) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java index c1fa3f9e1e8b..173bec1784b3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java @@ -119,8 +119,7 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse, @Override OMClientResponse onFailure(OMResponse.Builder omResponse, IOException exception) { - return new OMBucketAclResponse( - createErrorOMResponse(omResponse, exception)); + return super.onFailure(omResponse, exception); } @Override @@ -131,7 +130,9 @@ void onComplete(boolean operationResult, IOException exception, exception, getOmRequest().getUserInfo())); if (operationResult) { - LOG.debug("Remove acl: {} for path: {} success!", getAcls(), getPath()); + if (LOG.isDebugEnabled()) { + LOG.debug("Remove acl: {} for path: {} success!", getAcls(), getPath()); + } } else { omMetrics.incNumBucketUpdateFails(); if (exception == null) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java index 8cfe29ccd042..0f775761b3ba 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java @@ -120,8 +120,7 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse, @Override OMClientResponse onFailure(OMResponse.Builder omResponse, IOException exception) { - return new OMBucketAclResponse( - createErrorOMResponse(omResponse, exception)); + return super.onFailure(omResponse, exception); } @Override From 778ccdef463b24b12d614435fd895e64a0e2627c Mon Sep 17 00:00:00 2001 From: wangzhaohui8 Date: Tue, 20 Jul 2021 14:13:48 +0800 Subject: [PATCH 2/5] trigger CI From 794d1ccc9cda8b64729a39b9310225ba0978c9e1 Mon Sep 17 00:00:00 2001 From: wangzhaohui8 Date: Tue, 20 Jul 2021 17:46:33 +0800 Subject: [PATCH 3/5] Address comment --- .../ozone/om/request/bucket/acl/OMBucketAddAclRequest.java | 6 ------ .../om/request/bucket/acl/OMBucketRemoveAclRequest.java | 6 ------ .../ozone/om/request/bucket/acl/OMBucketSetAclRequest.java | 6 ------ 3 files changed, 18 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java index 4ecb67e0501c..aa93803ef3dd 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java @@ -119,12 +119,6 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse, return new OMBucketAclResponse(omResponse.build(), omBucketInfo); } - @Override - OMClientResponse onFailure(OMResponse.Builder omResponse, - IOException exception) { - return super.onFailure(omResponse, exception); - } - @Override void onComplete(boolean operationResult, IOException exception, OMMetrics omMetrics, AuditLogger auditLogger, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java index 173bec1784b3..4633e0310ae3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java @@ -116,12 +116,6 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse, return new OMBucketAclResponse(omResponse.build(), omBucketInfo); } - @Override - OMClientResponse onFailure(OMResponse.Builder omResponse, - IOException exception) { - return super.onFailure(omResponse, exception); - } - @Override void onComplete(boolean operationResult, IOException exception, OMMetrics omMetrics, AuditLogger auditLogger, diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java index 0f775761b3ba..d4ba01750575 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java @@ -117,12 +117,6 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse, return new OMBucketAclResponse(omResponse.build(), omBucketInfo); } - @Override - OMClientResponse onFailure(OMResponse.Builder omResponse, - IOException exception) { - return super.onFailure(omResponse, exception); - } - @Override void onComplete(boolean operationResult, IOException exception, OMMetrics omMetrics, AuditLogger auditLogger, From 5514387ff9f5fc34bca15ddebe42da264b65aede Mon Sep 17 00:00:00 2001 From: wangzhaohui8 Date: Wed, 21 Jul 2021 21:39:37 +0800 Subject: [PATCH 4/5] trigger CI From 064da637f182eb39956b1b9a61ef5babdfbef373 Mon Sep 17 00:00:00 2001 From: wangzhaohui8 Date: Mon, 26 Jul 2021 11:48:25 +0800 Subject: [PATCH 5/5] address the comment --- .../ozone/om/request/bucket/acl/OMBucketAddAclRequest.java | 4 +--- .../ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java index aa93803ef3dd..e6e4bc528e93 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java @@ -127,9 +127,7 @@ void onComplete(boolean operationResult, IOException exception, exception, getOmRequest().getUserInfo())); if (operationResult) { - if (LOG.isDebugEnabled()) { - LOG.debug("Add acl: {} to path: {} success!", getAcls(), getPath()); - } + LOG.debug("Add acl: {} to path: {} success!", getAcls(), getPath()); } else { omMetrics.incNumBucketUpdateFails(); if (exception == null) { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java index 4633e0310ae3..52e65ab1da73 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java @@ -124,9 +124,7 @@ void onComplete(boolean operationResult, IOException exception, exception, getOmRequest().getUserInfo())); if (operationResult) { - if (LOG.isDebugEnabled()) { - LOG.debug("Remove acl: {} for path: {} success!", getAcls(), getPath()); - } + LOG.debug("Remove acl: {} for path: {} success!", getAcls(), getPath()); } else { omMetrics.incNumBucketUpdateFails(); if (exception == null) {