Merge PR #21144 into master

* refs/pull/21144/head:
	mds: fix unhealth heartbeat during rejoin

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-04-09 21:33:00 -07:00
commit a3718d5978
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View File

@ -5412,6 +5412,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)