From: dongdong tao <tdd21151186@gmail.com>
Date: Fri, 30 Mar 2018 15:30:55 +0000 (+0800)
Subject: mds: fix unhealth heartbeat during rejoin
X-Git-Tag: v13.1.0~357^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8539a9827ba86c44a5285925923a16b8764a6a0a;p=ceph.git

mds: fix unhealth heartbeat during rejoin

function process_imported_caps might hold mds_lock too long,
mds tick thread will be starved, and leads to unhealth heartbeat check.
which would eventually make the mds been kicked by the monitor during rejoin phase.

Fixes: https://tracker.ceph.com/issues/23530
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index de600c84f02bb..af2c99debd941 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -5310,6 +5310,8 @@ bool MDCache::process_imported_caps()
     cap_imports_num_opening++;
     dout(10) << "  opening missing ino " << p->first << dendl;
     open_ino(p->first, (int64_t)-1, new C_MDC_RejoinOpenInoFinish(this, p->first), false);
+    if (!(cap_imports_num_opening % 1000))
+      mds->heartbeat_reset();
   }
 
   if (cap_imports_num_opening > 0)