HDDS-15739. Fix ListObjectsV2 continuation-token: wrong XML element name and empty-token handling#10668
Merged
Conversation
…ame and empty-token handling Serialize the echoed request continuation token as <ContinuationToken> (previously <continueToken>) so S3 SDK clients populate response['ContinuationToken'] instead of hitting a KeyError. Treat an empty continuation-token as no token: list from the start with IsTruncated=false and echo the empty token back, instead of throwing InvalidArgument when decoding it. Fixes ceph s3-tests test_bucket_listv2_continuationtoken, test_bucket_listv2_continuationtoken_empty and test_bucket_listv2_both_continuationtoken_startafter.
Contributor
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
ListObjectsV2 has two server-side bugs around the continuation token that make S3 SDK clients fail:
<continueToken>instead of AWS's<ContinuationToken>. botocore maps response fields byelement name, so
response['ContinuationToken']was never populated and clients that read itback hit a
KeyError.ContinuationToken=''was passed(non-null) into
ContinueToken.decodeFromString(), which found no separator and threwInvalidArgument. AWS treats an empty continuation token as no token — return all keys,IsTruncated=false, and echo''back.To align with AWS S3:
ContinuationToken(ListObjectResponse@XmlElement).BucketEndpoint, treat a null/emptycontinuation-tokenquery param as absent (list fromthe start, keyed off the decoded token) while still echoing the request value back.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-15739
How was this patch tested?
https://github.com/rich7420/ozone/actions/runs/28727345055