]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw_file: alternate fix deadlock on lru eviction 20034/head
authorMatt Benjamin <mbenjamin@redhat.com>
Fri, 19 Jan 2018 18:05:27 +0000 (13:05 -0500)
committerMatt Benjamin <mbenjamin@redhat.com>
Sat, 20 Jan 2018 14:56:20 +0000 (09:56 -0500)
commit3cf0880f86b8f7911139c4e3d672cf47420c8f49
tree594a27b8e40cd26da9228a42552571166097ebbf
parent2cfd5fece9cb1b5f491682ece1c19aca76a3d67d
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>
src/common/cohort_lru.h
src/rgw/rgw_file.cc
src/rgw/rgw_file.h