]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw_file: alternate fix deadlock on lru eviction 20076/head
authorMatt Benjamin <mbenjamin@redhat.com>
Fri, 19 Jan 2018 18:05:27 +0000 (13:05 -0500)
committerNathan Cutler <ncutler@suse.com>
Tue, 23 Jan 2018 10:45:42 +0000 (11:45 +0100)
commitdc48e5bc0a2c7446503e471e448adbddcdc7e29e
treeb9573d0397e2d6598e886d69c35752787a5dd644
parent351a689d438c60bb805e9af18fc260922e57bea9
rgw_file: alternate fix deadlock on lru eviction

This change is an alternate fix for two problems found and fixed
by Yao Zongyou <yaozongyou@vip.qq.com>.

The deadlock can be avoided just by not taking it in the recycle
case, which invariantly holds the lock.

The invalidation of the insert iterator by the recyle-path unlink
we'd like to handle as a condition in order to preserve the cached
insertion point optimization we get in the common case.  (The
original behavior was, indeed, incorrect.)

Based on feedback from Yao, removed the RGWFileHandle dtor version
of the unlink check, which I think happened twice.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 3cf0880f86b8f7911139c4e3d672cf47420c8f49)
src/common/cohort_lru.h
src/rgw/rgw_file.cc
src/rgw/rgw_file.h