From: Gregory Farnum Date: Tue, 29 Sep 2015 05:14:52 +0000 (-0700) Subject: Merge pull request #4791 from ceph/wip-11783 X-Git-Tag: v9.1.0~57 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e171984b9cfc739cdebb62f2e486ccb477ce6536;p=ceph.git Merge pull request #4791 from ceph/wip-11783 cephfs: detect completed cap flushes Reviewed-by: Greg Farnum --- e171984b9cfc739cdebb62f2e486ccb477ce6536 diff --cc src/mds/Beacon.cc index 93c54c734f9e,ea34ded8a13d..c28f9aaa5b4e --- a/src/mds/Beacon.cc +++ b/src/mds/Beacon.cc @@@ -396,12 -396,14 +396,14 @@@ void Beacon::notify_health(MDSRank cons dout(20) << " within timeout " << session->recalled_at << " vs. " << cutoff << dendl; } } - if (session->get_num_trim_requests_warnings() > 0 && - session->get_num_completed_requests() >= g_conf->mds_max_completed_requests) { + if ((session->get_num_trim_requests_warnings() > 0 && + session->get_num_completed_requests() >= g_conf->mds_max_completed_requests) || + (session->get_num_trim_flushes_warnings() > 0 && + session->get_num_completed_flushes() >= g_conf->mds_max_completed_flushes)) { std::ostringstream oss; - oss << "Client " << session->get_human_name() << " failing to advance its oldest_client_tid"; + oss << "Client " << session->get_human_name() << " failing to advance its oldest client/flush tid"; MDSHealthMetric m(MDS_HEALTH_CLIENT_OLDEST_TID, HEALTH_WARN, oss.str()); - m.metadata["client_id"] = session->info.inst.name.num(); + m.metadata["client_id"] = stringify(session->info.inst.name.num()); large_completed_requests_metrics.push_back(m); } } @@@ -423,9 -425,9 +425,9 @@@ } else { std::ostringstream oss; oss << "Many clients (" << large_completed_requests_metrics.size() - << ") failing to advance their oldest_client_tid"; + << ") failing to advance their oldest client/flush tid"; MDSHealthMetric m(MDS_HEALTH_CLIENT_OLDEST_TID_MANY, HEALTH_WARN, oss.str()); - m.metadata["client_count"] = large_completed_requests_metrics.size(); + m.metadata["client_count"] = stringify(large_completed_requests_metrics.size()); health.metrics.push_back(m); large_completed_requests_metrics.clear(); }