From: "Yan, Zheng" <[email protected]> If remote linkage without inode is encountered after some caps are issued, Server::handle_client_readdir() should send the reply to client immediately instead of retrying the request after opening the remote dentry. This is because the MDS may want to revoke these caps before the MDS succeeds in opening the remote dentry.
Signed-off-by: Yan, Zheng <[email protected]> --- src/mds/Server.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index c8c52e1..c95344e 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -2830,14 +2830,22 @@ void Server::handle_client_readdir(MDRequest *mdr) dout(10) << "skipping bad remote ino on " << *dn << dendl; continue; } else { - mdcache->open_remote_dentry(dn, dnp, new C_MDS_RetryRequest(mdcache, mdr)); - // touch everything i _do_ have for (it = dir->begin(); it != dir->end(); it++) if (!it->second->get_linkage()->is_null()) mdcache->lru.lru_touch(it->second); + + // already issued caps and leases, reply immediately. + if (dnbl.length() > 0) { + mdcache->open_remote_dentry(dn, dnp, new C_NoopContext); + dout(10) << " open remote dentry after caps were issued, stopping at " + << dnbl.length() << " < " << bytes_left << dendl; + break; + } + + mdcache->open_remote_dentry(dn, dnp, new C_MDS_RetryRequest(mdcache, mdr)); return; } } -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
