Skip to content

HDDS-5465. Delete redundant code when set、add and remove bucket acl #2439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChenSammi merged 5 commits into from
Jul 28, 2021
Merged

HDDS-5465. Delete redundant code when set、add and remove bucket acl #2439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f05e9d6
HDDS-5465. Delete redundant code when set、add and remove bucket acl
Jul 20, 2021
778ccde
trigger CI
Jul 20, 2021
794d1cc
Address comment
Jul 20, 2021
5514387
trigger CI
Jul 21, 2021
064da63
address the comment
Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...nager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAclRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down
7 changes: 0 additions & 7 deletions ...er/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketAddAclRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,6 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse,
return new OMBucketAclResponse(omResponse.build(), omBucketInfo);
}

@Override
OMClientResponse onFailure(OMResponse.Builder omResponse,
IOException exception) {
return new OMBucketAclResponse(
createErrorOMResponse(omResponse, exception));
}

@Override
void onComplete(boolean operationResult, IOException exception,
OMMetrics omMetrics, AuditLogger auditLogger,
Expand Down
7 changes: 0 additions & 7 deletions ...src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketRemoveAclRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,6 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse,
return new OMBucketAclResponse(omResponse.build(), omBucketInfo);
}

@Override
OMClientResponse onFailure(OMResponse.Builder omResponse,
IOException exception) {
return new OMBucketAclResponse(
createErrorOMResponse(omResponse, exception));
}

@Override
void onComplete(boolean operationResult, IOException exception,
OMMetrics omMetrics, AuditLogger auditLogger,
Expand Down
7 changes: 0 additions & 7 deletions ...er/src/main/java/org/apache/hadoop/ozone/om/request/bucket/acl/OMBucketSetAclRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,6 @@ OMClientResponse onSuccess(OMResponse.Builder omResponse,
return new OMBucketAclResponse(omResponse.build(), omBucketInfo);
}

@Override
OMClientResponse onFailure(OMResponse.Builder omResponse,
IOException exception) {
return new OMBucketAclResponse(
createErrorOMResponse(omResponse, exception));
}

@Override
void onComplete(boolean operationResult, IOException exception,
OMMetrics omMetrics, AuditLogger auditLogger,
Expand Down