Skip to content

HDDS-14851. [STS] Better Handling for PayloadTooLarge and Small Perf Fix #9938

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
fmorg-git wants to merge 1 commit into
base: HDDS-13323-sts
Choose a base branch
from
+16 −4
Open

HDDS-14851. [STS] Better Handling for PayloadTooLarge and Small Perf Fix #9938

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
4 changes: 3 additions & 1 deletion ...e/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.apache.hadoop.ozone.audit.AuditMessage;
import org.apache.hadoop.ozone.s3.HeaderPreprocessor;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.OSTSException;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
import org.apache.hadoop.ozone.s3.signature.SignatureInfo.Version;
import org.apache.hadoop.ozone.s3.util.AuditUtils;
Expand Down Expand Up @@ -209,7 +210,8 @@ private byte[] readAllBytes(InputStream in) throws OS3Exception, IOException {
int n;
while ((n = in.read(chunk)) != -1) {
if (totalRead + n > OZONE_S3G_STS_PAYLOAD_HASH_MAX_VALUE) {
throw PAYLOAD_TOO_LARGE;
throw new OSTSException(
PAYLOAD_TOO_LARGE.getCode(), PAYLOAD_TOO_LARGE.getErrorMessage(), PAYLOAD_TOO_LARGE.getHttpCode());
}
buffer.write(chunk, 0, n);
totalRead += n;
Expand Down
2 changes: 1 addition & 1 deletion ...ateway/src/main/java/org/apache/hadoop/ozone/s3sts/S3STSEnabledEndpointRequestFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/**
* Filter that disables all endpoints annotated with {@link S3STSEnabled}.
* Condition is based on the value of the configuration key
* ozone.s3g.s3sts.http.enabled.
* ozone.s3g.sts.http.enabled.
*/
@S3STSEnabled
@Provider
Expand Down
14 changes: 12 additions & 2 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3sts/S3STSEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,17 @@ public class S3STSEndpoint extends S3STSEndpointBase {
private static final String UNSUPPORTED_OPERATION = "UnsupportedOperation";
private static final String MALFORMED_POLICY_DOCUMENT = "MalformedPolicyDocument";

// JAXBContext is relatively expensive to create and is threadsafe, so cache and reuse
private static final JAXBContext JAXB_CONTEXT;

static {
try {
JAXB_CONTEXT = JAXBContext.newInstance(S3AssumeRoleResponseXml.class);
} catch (JAXBException e) {
throw new RuntimeException("Failed to initialize JAXBContext: " + e, e);
}
}

@Inject
private RequestIdentifier requestIdentifier;

Expand Down Expand Up @@ -330,8 +341,7 @@ private String generateAssumeRoleResponse(String assumedRoleUserArn, AssumeRoleR
meta.setRequestId(requestId);
response.setResponseMetadata(meta);

final JAXBContext jaxbContext = JAXBContext.newInstance(S3AssumeRoleResponseXml.class);
final Marshaller marshaller = jaxbContext.createMarshaller();
final Marshaller marshaller = JAXB_CONTEXT.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
final StringWriter stringWriter = new StringWriter();
marshaller.marshal(response, stringWriter);
Expand Down