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

rgw: release cls lock if taken in RGWCompleteMultipart #18104

Merged
merged 1 commit into from Oct 11, 2017

Conversation

Projects
None yet
3 participants
@mattbenjamin
Copy link
Contributor

commented Oct 3, 2017

Follows Casey's proposal to conditionally release the lock in
::complete(), in order to avoid duplicated code in various early
return cases.

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

Signed-off-by: Matt Benjamin mbenjamin@redhat.com

@mattbenjamin mattbenjamin self-assigned this Oct 3, 2017

@mattbenjamin mattbenjamin requested a review from cbodley Oct 3, 2017

@mattbenjamin mattbenjamin force-pushed the linuxbox2:rgw-rel-lock-earlyx branch from 33c9ba7 to 75d0578 Oct 3, 2017

@cbodley
Copy link
Contributor

left a comment

i like the MPSerializer 👍

@@ -5583,11 +5577,34 @@ void RGWCompleteMultipart::execute()
s->bucket_info, meta_obj, 0);
if (r < 0) {
ldout(store->ctx(), 0) << "WARNING: failed to remove object " << meta_obj << dendl;
r = l.unlock(&ioctx, raw_meta_oid);

This comment has been minimized.

Copy link
@cbodley

cbodley Oct 4, 2017

Contributor

if this delete succeeds, you can set locked=false to avoid sending the unlock

This comment has been minimized.

Copy link
@mattbenjamin

mattbenjamin Oct 4, 2017

Author Contributor

ah, right

rgw: release cls lock if taken in RGWCompleteMultipart
Follows Casey's proposal to conditionally release the lock in
::complete(), in order to avoid duplicated code in various early
return cases.

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

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

@mattbenjamin mattbenjamin force-pushed the linuxbox2:rgw-rel-lock-earlyx branch from 75d0578 to 704f793 Oct 4, 2017

@cbodley

cbodley approved these changes Oct 4, 2017

@cbodley

This comment has been minimized.

Copy link
Contributor

commented Oct 4, 2017

jenkins test this please

@yuriw

This comment has been minimized.

Copy link
Contributor

commented Oct 10, 2017

@yuriw yuriw merged commit 86256e1 into ceph:master Oct 11, 2017

5 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
make check (arm64) make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.