rgw: release cls lock if taken in RGWCompleteMultipart #18104
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
mattbenjamin
force-pushed
the
rgw-rel-lock-earlyx
branch
from
33c9ba7
to
75d0578
Compare
cbodley
reviewed
Oct 4, 2017
src/rgw/rgw_op.cc
Outdated
| @@ -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); | |||
There was a problem hiding this comment.
if this delete succeeds, you can set locked=false to avoid sending the unlock
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
force-pushed
the
rgw-rel-lock-earlyx
branch
from
75d0578
to
704f793
Compare
cbodley
approved these changes
Oct 4, 2017
|
jenkins test this please |
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.
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