adoroszlai commented on code in PR #9286:
URL: https://github.com/apache/ozone/pull/9286#discussion_r2832468628
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java:
##########
@@ -362,26 +370,17 @@ public Response listMultipartUploads(
try {
S3Owner.verifyBucketOwnerCondition(getHeaders(), bucketName,
bucket.getOwner());
OzoneMultipartUploadList ozoneMultipartUploadList =
- bucket.listMultipartUploads(prefix, keyMarker, uploadIdMarker,
maxUploads);
-
- ListMultipartUploadsResult result = new ListMultipartUploadsResult();
- result.setBucket(bucketName);
- result.setKeyMarker(keyMarker);
- result.setUploadIdMarker(uploadIdMarker);
- result.setNextKeyMarker(ozoneMultipartUploadList.getNextKeyMarker());
- result.setPrefix(prefix);
-
result.setNextUploadIdMarker(ozoneMultipartUploadList.getNextUploadIdMarker());
- result.setMaxUploads(maxUploads);
- result.setTruncated(ozoneMultipartUploadList.isTruncated());
+ bucket.listMultipartUploads(prefix, keyMarker, uploadIdMarker,
+ sanitizedMaxUploads);
+
+ ListMultipartUploadsResult result =
+ buildMultipartUploadsResult(bucket, prefix, delimiter, encodingType,
+ keyMarker, uploadIdMarker, sanitizedMaxUploads,
+ ozoneMultipartUploadList);
+
+ AUDIT.logReadSuccess(buildAuditMessageForSuccess(s3GAction,
+ getAuditParameters()));
Review Comment:
Please keep simplified `auditReadSuccess(s3GAction)` call.
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java:
##########
@@ -342,17 +352,15 @@ private Response handleCreateBucket(String bucketName)
public Response listMultipartUploads(
String bucketName,
String prefix,
+ String delimiter,
+ String encodingType,
Review Comment:
`listMultipartUploads` call does not pass these new arguments, causing
compile error.
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java:
##########
@@ -125,6 +126,19 @@ public Response get(
OzoneBucket bucket = null;
try {
+ final String aclMarker = queryParams().get(QueryParams.ACL);
+ if (aclMarker != null) {
+ s3GAction = S3GAction.GET_ACL;
+ S3BucketAcl result = getAcl(bucketName);
+ getMetrics().updateGetAclSuccessStats(startNanos);
+ auditReadSuccess(s3GAction);
+ return Response.ok(result, MediaType.APPLICATION_XML_TYPE).build();
+ }
Review Comment:
Please don't restore this, it was moved to `BucketAclHandler` in HDDS-14360.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
