RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 05:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #19060 into master

Browse Source 
* refs/pull/19060/head:
	client: anchor Inode while trimming caps

Reviewed-by: Zheng Yan <zyan@redhat.com>
This commit is contained in:
Patrick Donnelly 2017-11-22 13:39:19 -08:00
commit 39dc865fb1
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/Client.cc
View File

@ -4060,9 +4060,10 @@ void Client::trim_caps(MetaSession *s, uint64_t max)
uint64_t trimmed = 0;
xlist<Cap*>::iterator p = s->caps.begin();
std::set<InodeRef> anchor; /* prevent put_inode from deleting all caps during traversal */
while ((caps_size - trimmed) > max && !p.end()) {
Cap *cap = *p;
Inode *in = cap->inode;
InodeRef in(cap->inode);
// Increment p early because it will be invalidated if cap
// is deleted inside remove_cap
@ -4072,16 +4073,16 @@ void Client::trim_caps(MetaSession *s, uint64_t max)
int mine = cap->issued | cap->implemented;
int oissued = in->auth_cap ? in->auth_cap->issued : 0;
// disposable non-auth cap
if (!(get_caps_used(in) & ~oissued & mine)) {
if (!(get_caps_used(in.get()) & ~oissued & mine)) {
ldout(cct, 20) << " removing unused, unneeded non-auth cap on " << *in << dendl;
remove_cap(cap, true);
/* N.B. no need to push onto anchor, as we are only removing one cap */
trimmed++;
}
} else {
ldout(cct, 20) << " trying to trim dentries for " << *in << dendl;
bool all = true;
set<Dentry*>::iterator q = in->dn_set.begin();
InodeRef tmp_ref(in);
while (q != in->dn_set.end()) {
Dentry *dn = *q++;
if (dn->lru_is_expireable()) {
@ -4092,6 +4093,8 @@ void Client::trim_caps(MetaSession *s, uint64_t max)
// the end of this function.
_schedule_invalidate_dentry_callback(dn, true);
}
ldout(cct, 20) << " anchoring inode: " << in->ino << dendl;
anchor.insert(in);
trim_dentry(dn);
} else {
ldout(cct, 20) << " not expirable: " << dn->name << dendl;
@ -4104,6 +4107,8 @@ void Client::trim_caps(MetaSession *s, uint64_t max)
}
}
}
ldout(cct, 20) << " clearing anchored inodes" << dendl;
anchor.clear();
caps_size = s->caps.size();
if (caps_size > max)