Skip to content

HDDS-15940. Handle unexpected OMExceptions in S3 putBucketLifecycleConfiguration #10848

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

Open
priyeshkaratha wants to merge 1 commit into
base: master
Choose a base branch
from
+61 −5
Open

HDDS-15940. Handle unexpected OMExceptions in S3 putBucketLifecycleConfiguration #10848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions ...-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketCrudHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,7 @@ public Response putBucketLifecycleConfiguration(S3RequestContext context, String
} catch (WebApplicationException ex) {
throw S3ErrorTable.newError(S3ErrorTable.MALFORMED_XML, bucketName);
} catch (OMException ex) {
if (ex.getResult() == OMException.ResultCodes.ACCESS_DENIED) {
throw S3ErrorTable.newError(S3ErrorTable.ACCESS_DENIED, bucketName);
} else if (ex.getResult() == OMException.ResultCodes.INVALID_REQUEST) {
throw S3ErrorTable.newError(S3ErrorTable.INVALID_REQUEST, bucketName, ex);
}
throw S3ErrorTable.newError(bucketName, ex);
}
return Response.ok().build();
}
Expand Down
60 changes: 60 additions & 0 deletions ...ay/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestS3LifecycleConfigurationPut.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,22 @@

import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static java.net.HttpURLConnection.HTTP_OK;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.ACCESS_DENIED;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.INTERNAL_ERROR;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.INVALID_REQUEST;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.MALFORMED_XML;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.NO_SUCH_BUCKET;
import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.QUOTA_EXCEEDED;
import static org.apache.hadoop.ozone.s3.util.S3Consts.EXPECTED_BUCKET_OWNER_HEADER;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand All @@ -38,8 +45,13 @@
import javax.ws.rs.core.HttpHeaders;
import org.apache.hadoop.ozone.client.BucketArgs;
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.util.S3Consts;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -181,6 +193,54 @@ public void testPutLifecycleConfigurationFailsWithNonBucketOwner()
}
}

@Test
public void testPutLifecycleConfigurationPropagatesQuotaExceeded()
throws Exception {
// QUOTA_EXCEEDED is not explicitly handled by putBucketLifecycleConfiguration.
// It must still surface as an OS3Exception instead of a false HTTP 200.
assertUnhandledOMExceptionPropagated(
new OMException("Quota exceeded", OMException.ResultCodes.QUOTA_EXCEEDED),
HTTP_FORBIDDEN, QUOTA_EXCEEDED.getCode());
}

@Test
public void testPutLifecycleConfigurationPropagatesInternalError()
throws Exception {
// An unexpected internal OM failure must be reported as InternalError (HTTP 500),
// not swallowed into a false HTTP 200 success.
assertUnhandledOMExceptionPropagated(
new OMException("boom", OMException.ResultCodes.INTERNAL_ERROR),
HTTP_INTERNAL_ERROR, INTERNAL_ERROR.getCode());
}

private void assertUnhandledOMExceptionPropagated(OMException omException,
int expectedHttpCode, String expectedErrorCode) throws Exception {
OzoneClient mockClient = mock(OzoneClient.class);
ObjectStore mockObjectStore = mock(ObjectStore.class);
OzoneVolume mockVolume = mock(OzoneVolume.class);
OzoneBucket mockBucket = mock(OzoneBucket.class);
when(mockBucket.getVolumeName()).thenReturn("s3v");
when(mockBucket.getName()).thenReturn("bucket1");
when(mockBucket.getBucketLayout()).thenReturn(BucketLayout.OBJECT_STORE);
doThrow(omException).when(mockBucket).setLifecycleConfiguration(any());
ClientProtocol clientProtocol = mock(ClientProtocol.class);
when(mockClient.getObjectStore()).thenReturn(mockObjectStore);
when(mockClient.getProxy()).thenReturn(clientProtocol);
when(mockObjectStore.getClientProxy()).thenReturn(clientProtocol);
when(mockObjectStore.getS3Volume()).thenReturn(mockVolume);
when(mockVolume.getBucket("bucket1")).thenReturn(mockBucket);

BucketEndpoint endpoint = EndpointBuilder.newBucketEndpointBuilder()
.setClient(mockClient)
.build();
endpoint.queryParamsForTest().set(S3Consts.QueryParams.LIFECYCLE, "");

OS3Exception ex = assertThrows(OS3Exception.class,
() -> endpoint.put("bucket1", onePrefix()));
assertEquals(expectedHttpCode, ex.getHttpCode());
assertEquals(expectedErrorCode, ex.getCode());
}

@Test
public void testPutLifecycleWithAbortIncompleteMultipartUpload() throws Exception {
assertEquals(HTTP_OK, bucketEndpoint.put("bucket1", withAbortIncompleteMultipartUpload()).getStatus());
Expand Down