From: John Spray <john.spray@redhat.com>
Date: Sun, 5 Mar 2017 15:38:36 +0000 (-0500)
Subject: mon: don't enqueue periodic digest if one is already waiting
X-Git-Tag: v12.0.3~159^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f68ad16e86f5abaedc9261aa09250d75fe372e31;p=ceph.git

mon: don't enqueue periodic digest if one is already waiting

This was causing mons to send far more digest messages than
should have been sent.  Could have been responsible for
reports of very high CPU consumption on the mgr daemon.

Fixes: http://tracker.ceph.com/issues/18994
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 5d6bbb931a6a..7079db17b5b3 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -263,7 +263,9 @@ void MgrMonitor::check_sub(Subscription *sub)
     }
   } else {
     assert(sub->type == "mgrdigest");
-    send_digests();
+    if (digest_callback == nullptr) {
+      send_digests();
+    }
   }
 }
 
@@ -536,7 +538,9 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op)
 
 void MgrMonitor::init()
 {
-  send_digests();  // To get it to schedule its own event
+  if (digest_callback == nullptr) {
+    send_digests();  // To get it to schedule its own event
+  }
 }
 
 void MgrMonitor::on_shutdown()