Merge pull request #4791 from ceph/wip-11783

cephfs: detect completed cap flushes

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/mds/Beacon.cc
index 93c54c734f9ea1740f0678ccdd5b4120436e92d2,ea34ded8a13d2a783b3e6c34ef8f9d13cca11e16..c28f9aaa5b4e8190426f0af3c73f0bace28976d6
--- 1/src/mds/Beacon.cc
--- 2/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();
      }

diff --cc src/mds/MDSRank.cc
Simple merge

diff --cc src/mds/mdstypes.h
Simple merge