mgr: introduce tick() calls through the system

Still empty for the moment

Signed-off-by: Greg Farnum <[email protected]>

src/messages/MMonMgrReport.h

@@ -33,7 +33,7 @@ class MMonMgrReport : public PaxosServiceMessage {
   ~MMonMgrReport() override {}
 
 public:
-
+  bool needs_send = false;
   const char *get_type_name() const override { return "monmgrreport"; }
 
   void print(ostream& out) const override {

src/mgr/ClusterState.cc

@@ -12,6 +12,7 @@
  */
 
 #include "messages/MMgrDigest.h"
+#include "messages/MMonMgrReport.h"
 #include "messages/MPGStats.h"
 
 #include "mgr/ClusterState.h"
@@ -113,3 +114,7 @@ void ClusterState::notify_osdmap(const OSDMap &osd_map)
   // while the full-blown PGMap lives only here.
 }
 
+void ClusterState::tick(MMonMgrReport *m)
+{
+  dout(0) << __func__ << dendl;
+}

src/mgr/ClusterState.h

@@ -22,6 +22,7 @@
 #include "mon/PGMap.h"
 
 class MMgrDigest;
+class MMonMgrReport;
 class MPGStats;
 
 
@@ -57,6 +58,8 @@ class ClusterState
 
   void notify_osdmap(const OSDMap &osd_map);
 
+  void tick(MMonMgrReport *m);
+
   bool have_fsmap() const {
     Mutex::Locker l(lock);
     return fsmap.get_epoch() > 0;

src/mgr/DaemonServer.h

@@ -32,6 +32,7 @@
 
 class MMgrReport;
 class MMgrOpen;
+class MMonMgrReport;
 class MCommand;
 struct MgrCommand;
 
@@ -111,6 +112,7 @@ class DaemonServer : public Dispatcher
   bool handle_open(MMgrOpen *m);
   bool handle_report(MMgrReport *m);
   bool handle_command(MCommand *m);
+  void tick(MMonMgrReport *m) {}
 };
 
 #endif

src/mgr/Mgr.cc

@@ -27,6 +27,7 @@
 #include "DaemonServer.h"
 #include "messages/MMgrBeacon.h"
 #include "messages/MMgrDigest.h"
+#include "messages/MMonMgrReport.h"
 #include "messages/MCommand.h"
 #include "messages/MCommandReply.h"
 #include "messages/MLog.h"
@@ -583,3 +584,14 @@ void Mgr::handle_mgr_digest(MMgrDigest* m)
   m->put();
 }
 
+void Mgr::tick()
+{
+  dout(0) << __func__ << dendl;
+  MMonMgrReport *m = new MMonMgrReport();
+  cluster_state.tick(m);
+  server.tick(m);
+  // TODO? We currently do not notify the PyModules
+  if (m->needs_send) {
+    monc->send_mon_message(m);
+  }
+}

src/mgr/Mgr.h

@@ -86,6 +86,8 @@ class Mgr {
 
   bool ms_dispatch(Message *m);
 
+  void tick();
+
   void background_init();
   void shutdown();
 };

src/mgr/MgrStandby.cc

@@ -159,8 +159,13 @@ void MgrStandby::send_beacon()
 
 void MgrStandby::tick()
 {
+  dout(0) << __func__ << dendl;
   send_beacon();
 
+  if (active_mgr) {
+    active_mgr->tick();
+  }
+
   timer.add_event_after(g_conf->mgr_tick_period, new FunctionContext(
         [this](int r){
           tick();