update sources to 12.2.7

[ceph.git] / ceph / src / mgr / DaemonState.cc

diff --git a/ceph/src/mgr/DaemonState.cc b/ceph/src/mgr/DaemonState.cc
index a7b8f572e1614b3f0a0b420f7685ccdeccb5ecaa..dc6726739d3657f800fac5c0aa5ad3d7d58e37e7 100644 (file)
--- a/ceph/src/mgr/DaemonState.cc
+++ b/ceph/src/mgr/DaemonState.cc
@@ -133,6 +133,8 @@ void DaemonPerfCounters::update(MMgrReport *report)
   for (const auto &t : report->declare_types) {
     types.insert(std::make_pair(t.path, t));
     session->declared_types.insert(t.path);
+    instances.insert(std::pair<std::string, PerfCounterInstance>(
+                     t.path, PerfCounterInstance(t.type)));
   }
   // Remove any old types
   for (const auto &t : report->undeclare_types) {
@@ -154,9 +156,10 @@ void DaemonPerfCounters::update(MMgrReport *report)
     if (t.type & PERFCOUNTER_LONGRUNAVG) {
       ::decode(avgcount, p);
       ::decode(avgcount2, p);
+      instances.at(t_path).push_avg(now, val, avgcount);
+    } else {
+      instances.at(t_path).push(now, val);
     }
-    // TODO: interface for insertion of avgs
-    instances[t_path].push(now, val);
   }
   DECODE_FINISH(p);
 }
@@ -171,3 +174,8 @@ void PerfCounterInstance::push(utime_t t, uint64_t const &v)
   buffer.push_back({t, v});
 }
 
+void PerfCounterInstance::push_avg(utime_t t, uint64_t const &s,
+                                   uint64_t const &c)
+{
+  avg_buffer.push_back({t, s, c});
+}