From 0d7f70b3ddfec9509bba2fbbffbd2daee4280a7c Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Mon, 6 Aug 2018 14:51:09 +0800 Subject: [PATCH] client: fix choose_target_mds for requests that do name lookup There are two cases that a dirfrag is not recorded in CInode::fragmap. One is that the dirfrag is not subtree root, another is that client does not know which mds is dirfrag's auth mds. For the both cases, requests that do name lookup are better to sent to dir inode's auth mds. Fixes: http://tracker.ceph.com/issues/26860 Signed-off-by: "Yan, Zheng" (cherry picked from commit 436d1741e623748bc0dfd4e305d4c07cc602a093) Conflicts: src/client/Client.cc : Resolved in choose_target_mds --- src/client/Client.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/Client.cc b/src/client/Client.cc index 7043f9058a405..12bb20e00d97d 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -1465,6 +1465,10 @@ mds_rank_t Client::choose_target_mds(MetaRequest *req, Inode** phash_diri) mds = in->fragmap[fg]; if (phash_diri) *phash_diri = in; + } else if (in->auth_cap) { + mds = in->auth_cap->session->mds_num; + } + if (mds >= 0) { ldout(cct, 10) << "choose_target_mds from dirfragtree hash" << dendl; goto out; }