update sources to v12.1.2

[ceph.git] / ceph / src / mgr / MgrStandby.h

diff --git a/ceph/src/mgr/MgrStandby.h b/ceph/src/mgr/MgrStandby.h
index d33c633dc424ebf4569f7286f3372de9579163a8..e24f175cada4090845e42157e26d7313f88fa304 100644 (file)
--- a/ceph/src/mgr/MgrStandby.h
+++ b/ceph/src/mgr/MgrStandby.h
@@ -24,11 +24,6 @@
 #include "mon/MonClient.h"
 #include "osdc/Objecter.h"
 
-#include "DaemonServer.h"
-#include "PyModules.h"
-
-#include "DaemonState.h"
-#include "ClusterState.h"
 
 class MMgrMap;
 class Mgr;
@@ -53,15 +48,21 @@ protected:
   Mutex lock;
   SafeTimer timer;
 
-  std::unique_ptr<Mgr> active_mgr;
+  std::shared_ptr<Mgr> active_mgr;
+
+  int orig_argc;
+  const char **orig_argv;
 
   std::string state_str();
 
   void handle_mgr_map(MMgrMap *m);
   void _update_log_config();
+  void send_beacon();
+
+  bool available_in_map;
 
 public:
-  MgrStandby();
+  MgrStandby(int argc, const char **argv);
   ~MgrStandby() override;
 
   bool ms_dispatch(Message *m) override;
@@ -73,10 +74,10 @@ public:
 
   int init();
   void shutdown();
-  void usage() {}
+  void respawn();
   int main(vector<const char *> args);
   void handle_signal(int signum);
-  void send_beacon();
+  void tick();
 };
 
 #endif