From: Xiaoxi CHEN Date: Thu, 25 Jul 2019 14:10:20 +0000 (-0700) Subject: Client: unlink dentry for inode with llref=0 X-Git-Tag: v15.1.0~2035^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29321%2Fhead;p=ceph.git Client: unlink dentry for inode with llref=0 when client get notification from MDS that a file has been deleted(via getting CEPH_CAP_LINK_SHARED cap for inode with nlink = 0), if the client hasnt touch the inode in the past, the ll_ref will be zero. In previous code, we only call Client::unlink when ll_ref > 0, which is wrong and will leave the dn in cache, keeping the caps and resulting the inode stays in stray till the dn cache is dropped by kernel. Under certain workload(write intensive and rotate intensive), this issue can cause stray stacking to 100k+ and causeing huge space "leaking". Fixes: http://tracker.ceph.com/issues/40960 Signed-off-by: Xiaoxi CHEN --- diff --git a/src/client/Client.cc b/src/client/Client.cc index 9801747fa0d..fb7eb15d952 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -5105,6 +5105,7 @@ void Client::_schedule_invalidate_dentry_callback(Dentry *dn, bool del) void Client::_try_to_trim_inode(Inode *in, bool sched_inval) { int ref = in->get_num_ref(); + ldout(cct, 5) << __func__ << " in " << *in <dir && !in->dir->dentries.empty()) { for (auto p = in->dir->dentries.begin(); @@ -5133,14 +5134,16 @@ void Client::_try_to_trim_inode(Inode *in, bool sched_inval) --ref; } - if (ref > 0 && in->ll_ref > 0 && sched_inval) { + if (ref > 0) { auto q = in->dentries.begin(); while (q != in->dentries.end()) { Dentry *dn = *q; ++q; - // FIXME: we play lots of unlink/link tricks when handling MDS replies, - // so in->dentries doesn't always reflect the state of kernel's dcache. - _schedule_invalidate_dentry_callback(dn, true); + if( in->ll_ref > 0 && sched_inval) { + // FIXME: we play lots of unlink/link tricks when handling MDS replies, + // so in->dentries doesn't always reflect the state of kernel's dcache. + _schedule_invalidate_dentry_callback(dn, true); + } unlink(dn, true, true); } }