Skip to content

rgw: fix bucket index list test error#42836

Merged
ivancich merged 3 commits intoceph:masterfrom
ivancich:wip-fix-bi-test-error
Sep 3, 2021
Merged

rgw: fix bucket index list test error#42836
ivancich merged 3 commits intoceph:masterfrom
ivancich:wip-fix-bi-test-error

Conversation

@ivancich
Copy link
Member

@ivancich ivancich commented Aug 18, 2021

Fix bug surrounding calculation of number of entries returned. Add additional level 20 logging.

In test, make sure marker is cleared. Put end-of-list check inside the conditional with the rest of the test. End use of uninitialized variable.

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

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

@ivancich ivancich force-pushed the wip-fix-bi-test-error branch 3 times, most recently from bd6c2eb to 468ce77 Compare August 23, 2021 17:31
}

static std::string quote_escape(const std::string& s) {
return '"' + escape_str(s) + '"';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps its being fussy, but perhaps pre-allocate or reserve escape_str?

Copy link
Member Author

@ivancich ivancich Aug 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if the change is what you had in mind. Please take a gander.

@ivancich ivancich force-pushed the wip-fix-bi-test-error branch 5 times, most recently from 97f6d98 to 0e5da92 Compare August 26, 2021 20:38
@ivancich ivancich force-pushed the wip-fix-bi-test-error branch from 0e5da92 to d4ed44c Compare August 30, 2021 20:51
@ivancich ivancich removed the DNM label Aug 30, 2021
Fix bugs surrounding calculation of number of entries returned and
whether the end of a listing range has been reached.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
Adding more level 20 logging for bucket index listing.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
Make sure marker is cleared. Put end-of-list check inside the
conditional with the rest of the test. Add some additional testing.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
@ivancich ivancich force-pushed the wip-fix-bi-test-error branch from d4ed44c to 1bf0581 Compare August 31, 2021 15:05
@ivancich ivancich requested a review from cbodley August 31, 2021 15:07
@cbodley
Copy link
Contributor

cbodley commented Sep 2, 2021

@ivancich
Copy link
Member Author

ivancich commented Sep 3, 2021

Teuthology results:

rgw/verify: https://pulpito.ceph.com/ivancich-2021-09-03_00:17:55-rgw-wip-fix-bi-test-error-distro-basic-smithi/
rgw/(non-verify): https://pulpito.ceph.com/ivancich-2021-09-03_00:18:24-rgw-wip-fix-bi-test-error-distro-basic-smithi/

I do not believe there are any regressions. These tests were run with --suite-branch set to the branch, so the new tests were used.

@cbodley Is it possible that the failures you saw were due to another PR on your branch or the present state of master?

@ivancich ivancich merged commit 5b324a1 into ceph:master Sep 3, 2021
@ivancich ivancich removed the needs-qa label Sep 3, 2021
@cbodley
Copy link
Contributor

cbodley commented Sep 3, 2021

thanks @ivancich!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants