rgw_file: avoid a recursive lane lock in LRU drain #15819
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 oh, I've encountered this before, I shall try it out soon, thanks~ |
cbodley
approved these changes
Jun 22, 2017
mattbenjamin
force-pushed
the
wip-clru-lockfix
branch
from
fb76d4a
to
6c0a347
Compare
|
retest this please |
mattbenjamin
force-pushed
the
wip-clru-lockfix
branch
from
6c0a347
to
9cb4169
Compare
|
retest this please |
cbodley
reviewed
Jun 22, 2017
src/common/cohort_lru.h
Outdated
| * safe_link mode */ | ||
| uref(v); | ||
| p.tr.erase(it); | ||
| drain_q.push_front(*v); /* safe to re-use hook, !LINKED */ |
There was a problem hiding this comment.
regarding the comment: this is using the new q2_hook, not reusing lru_hook
While highly unlikely in normal fs operations, draining an entire filesystem could induce a recursion on object delete/unref, when provoked by cohort_lru::drain(). Adjusted to use intrusive slist rather than std:vector<T*> after review. Found running librgw_file_nfsns unit test. Fixes: http://tracker.ceph.com/issues/20374 Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
mattbenjamin
force-pushed
the
wip-clru-lockfix
branch
from
9cb4169
to
e12fc13
Compare
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.
While highly unlikely in normal fs operations, draining an
entire filesystem could induce a recursion on object delete/unref,
when provoked by cohort_lru::drain().
Found running librgw_file_nfsns unit test.
Fixes: http://tracker.ceph.com/issues/20374
Signed-off-by: Matt Benjamin mbenjamin@redhat.com