rgw multisite: fix RGWCoroutine error handling #39182
Merged
Conversation
This file contains 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
added with yield_spawn_window() and drain_all_cb() but shadowed by the 'int ret' parameter in both callbacks Signed-off-by: Casey Bodley <cbodley@redhat.com>
when the drain_children() callback function returns an error, set the should_exit flag so that the drain_with_cb() macro can return that error code via set_cr_error() Fixes: https://tracker.ceph.com/issues/49065 Signed-off-by: Casey Bodley <cbodley@redhat.com>
collect() returns false when it gets to the last stack. but it always collects one result, so we need to check for errors even when it returns false Signed-off-by: Casey Bodley <cbodley@redhat.com>
cbodley
commented
Jan 29, 2021
| @@ -1010,10 +1014,11 @@ bool RGWCoroutine::drain_children(int num_cr_left, | |||
| int r = (*cb)(stack_id, ret); | |||
| if (r < 0) { | |||
| drain_status.ret = r; | |||
| drain_status.should_exit = true; | |||
There was a problem hiding this comment.
@yehudasa this flag was added in #35511 but nothing set it to true. we need to set it here, so the drain_with_cb() macro can return the error from cb:
#define drain_with_cb(n, cb) \
drain_status.init(); \
yield_until_true(drain_children(n, cb)); \
if (drain_status.should_exit) { \
return set_cr_error(drain_status.ret); \
}
adamemerson
approved these changes
Feb 4, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
two bug fixes that were preventing
RGWRunBucketSourcesSyncCRfrom getting the errors from theRGWRunBucketSyncCoroutines it spawnsFixes: https://tracker.ceph.com/issues/49065
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox