This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 d0888381b7 HDDS-8222. EndpointBase#getBucket should handle
BUCKET_NOT_FOUND (#4431)
d0888381b7 is described below
commit d0888381b77f4356c6ff35b31dbbdddb47c9fb12
Author: hao guo <[email protected]>
AuthorDate: Tue Mar 21 21:43:36 2023 +0800
HDDS-8222. EndpointBase#getBucket should handle BUCKET_NOT_FOUND (#4431)
---
.../main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java | 2 +-
.../org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java
index 56a187fd00..77b7211a3a 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java
@@ -92,7 +92,7 @@ public abstract class EndpointBase implements Auditor {
try {
bucket = volume.getBucket(bucketName);
} catch (OMException ex) {
- if (ex.getResult() == ResultCodes.KEY_NOT_FOUND) {
+ if (ex.getResult() == ResultCodes.BUCKET_NOT_FOUND) {
throw newError(S3ErrorTable.NO_SUCH_BUCKET, bucketName, ex);
} else if (ex.getResult() == ResultCodes.INVALID_TOKEN) {
throw newError(S3ErrorTable.ACCESS_DENIED,
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
index f81b89bf1a..3763fb2fd1 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
@@ -157,7 +157,10 @@ public class TestS3GatewayMetrics {
null, "random", null,
null, null);
fail();
- } catch (OS3Exception e) {
+ } catch (OS3Exception ex) {
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getCode(), ex.getCode());
+ assertEquals(S3ErrorTable.NO_SUCH_BUCKET.getErrorMessage(),
+ ex.getErrorMessage());
}
long curMetric = metrics.getGetBucketFailure();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
