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

luminous: rgw: RGWCoroutine::call(nullptr) sets retcode=0 #30329

Merged
merged 1 commit into from Nov 5, 2019

Conversation

smithfarm
Copy link
Contributor

callers generally expect 'yield call(...);' to set retcode with the
result of the given coroutine. it's valid to call() a nullptr, but
that's not always clear at the call site - for example, this critical
piece of code in RGWBucketSyncSingleEntryCR::operate():

      if (sync_status == 0) {
        /* update marker */
        set_status() << "calling marker_tracker->finish(" << entry_marker << ")";
        yield call(marker_tracker->finish(entry_marker));
        sync_status = retcode;
      }

marker_tracker->finish() only returns a coroutine when it needs to flush
the marker; otherwise it returns a nullptr. as a result, 'retcode' may
not be assigned as expected by the call(), and a previous value is
mistakenly returned up the stack

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 7d12a11)
@smithfarm
Copy link
Contributor Author

jenkins test signed

@smithfarm
Copy link
Contributor Author

jenkins test submodules

@yuriw
Copy link
Contributor

yuriw commented Nov 4, 2019

@yuriw yuriw merged commit 946d0c3 into ceph:luminous Nov 5, 2019
@smithfarm smithfarm deleted the wip-41626-luminous branch November 5, 2019 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants