Skip to content
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.

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

mimic: rgw: support delimiter longer then one symbol #29018

Merged
merged 3 commits into from Jul 16, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Jul 12, 2019

Fix prefix and CommonPrefix extraction logic in
RGWRados::Bucket::List::list_objects_ordered so as to permit
arbitrary-length string delimiters.

Fixes: https://tracker.ceph.com/issues/24821

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit e3c1ea2)
@smithfarm smithfarm self-assigned this Jul 12, 2019
@smithfarm smithfarm added this to the mimic milestone Jul 12, 2019
@smithfarm smithfarm added bug fix core rgw and removed bug fix core labels Jul 12, 2019
@smithfarm smithfarm requested a review from cbodley Jul 12, 2019
@smithfarm smithfarm changed the title mimic: rgw doesnt support delimiter longer then one symbol mimic: rgw: support delimiter longer then one symbol Jul 12, 2019
@cbodley

This comment has been minimized.

Copy link
Contributor

cbodley commented Jul 12, 2019

thanks @smithfarm; this change caused a regression (http://tracker.ceph.com/issues/39989), and we merged a followup fix in #28192. could you please include that here?

…t object with char '0'

'/' + 1 = '0', and the start marker will be skipped, so it will miss the
'0' object.

Fixes: http://tracker.ceph.com/issues/39989

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 43b5264)

Conflicts:
	src/rgw/rgw_rados.cc
- mimic does not have "unsigned" in the line "unsigned char e = delim.back();"
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Jul 12, 2019

@cbodley Done, thanks.

the following code also need after_delim_s to skip directory after list
1000 objects

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 8c66783)
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jul 15, 2019

@yuriw yuriw merged commit ca837bc into ceph:mimic Jul 16, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm deleted the smithfarm:wip-38776-mimic branch Jul 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.