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

nautilus: rgw: ordered bucket listing code clean-up #37169

Merged
merged 2 commits into from Sep 23, 2020

Conversation

ivancich
Copy link
Member

@ivancich ivancich commented Sep 15, 2020

rgw: ordered bucket listing code clean-up

As a result of an earlier bug-fix, the code for ordered bucket listing is now more complex than it needs to be. This reverts that fix and applies a cleaner one.

This change is not applicable to octopus or later because the ordered bucket listing code underwent a significant change in between. Specifically much of the delimiter filtering logic was moved to cls/osd code.

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

Signed-off-by: J. Eric Ivancich ivancich@redhat.com

… keys"

This reverts commit 04b15ce.

While this did fix https://tracker.ceph.com/issues/40905, it did so in
an unnecessarily complex manner. So we're reverting it to more easily
apply a cleaner solution.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
The code mistakenly uses the current marker to figure out how to skip
past a pseudo-directory. This could allow for some entries in a bucket
to be skipped. The code should have used the current pseudo-directory
to determine what to skip past.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
@cbodley
Copy link
Contributor

cbodley commented Sep 16, 2020

jenkins test make check

@smithfarm smithfarm added this to the nautilus milestone Sep 17, 2020
@smithfarm smithfarm added nautilus-batch-1 nautilus point releases needs-qa and removed needs-review labels Sep 17, 2020
@smithfarm
Copy link
Contributor

@ivancich It would be nice if the commit message could include some (even very brief) verbiage explaining why the fix is applicable only to nautilus and cannot be backported from master or octopus.

@ivancich
Copy link
Member Author

@smithfarm I just want to make certain you want that documentation in the two commit messages. Normally I don't reference specific releases in commit messages. I will update the PR message.

@smithfarm
Copy link
Contributor

smithfarm commented Sep 17, 2020

@smithfarm I just want to make certain you want that documentation in the two commit messages. Normally I don't reference specific releases in commit messages. I will update the PR message.

The PR message is for now, but the commit messages are for posterity. So, yes, I do mean to put the explanation in the commit messages themselves. According to https://github.com/ceph/ceph/blob/master/SubmittingPatches-backports.rst#cherry-picking-rules one of the cherry-picking rules is:

"if a commit could not be cherry-picked from master, the commit message must explain why that was not possible."

(emphasis added)

So, you would not necessarily have to mention a specific branch (other than "master"). My recommended formulation is "This commit cannot be cherry-picked from master because . . ."

This case is discussed further in https://github.com/ceph/ceph/blob/master/SubmittingPatches-backports.rst#notes-on-the-cherry-picking-rules if you're interested.

@yuriw
Copy link
Contributor

yuriw commented Sep 18, 2020

@smithfarm smithfarm changed the title rgw: ordered bucket listing code clean-up nautilus: rgw: ordered bucket listing code clean-up Sep 18, 2020
@yuriw yuriw merged commit 12a2742 into ceph:nautilus Sep 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants