common/perf_counters: allow perfcounters to be excluded from daemonperf

By omitting the 'nick' we exclude a whole group of metrics from the
daemonperf results.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
index ba6f9ab68dc6b1e4018cb6d8e4c111ce94c0e295..c869880a1e2426539344189339b5d449a860a370 100644 (file)
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@@ -378,7 +378,7 @@ void PerfCounters::dump_formatted_generic(Formatter *f, bool schema,
         f->dump_string("description", "");
       }
 
-      if (d->nick != NULL) {
+      if (d->nick != NULL && !suppress_nicks) {
         f->dump_string("nick", d->nick);
       } else {
         f->dump_string("nick", "");

diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h
index 1556ee582cf60a1bfadebda1340a236db891ea00..ca498a9bc7dcd1d02dc356bb62afe71b13cb6f2f 100644 (file)
--- a/src/common/perf_counters.h
+++ b/src/common/perf_counters.h
@@ -179,6 +179,10 @@ public:
     m_name = s;
   }
 
+  void set_suppress_nicks(bool b) {
+    suppress_nicks = b;
+  }
+
 private:
   PerfCounters(CephContext *cct, const std::string &name,
             int lower_bound, int upper_bound);
@@ -195,6 +199,8 @@ private:
   std::string m_name;
   const std::string m_lock_name;
 
+  bool suppress_nicks = false;
+
   /** Protects m_data */
   mutable Mutex m_lock;