import 15.2.4

[ceph.git] / ceph / src / tools / rbd_mirror / ImageReplayer.h

diff --git a/ceph/src/tools/rbd_mirror/ImageReplayer.h b/ceph/src/tools/rbd_mirror/ImageReplayer.h
index 493d38d9d2845e6e4e82dbee53183b7cdafd257f..9569f025bea2c906d8d3c9b5d66034e255a0f3ce 100644 (file)
--- a/ceph/src/tools/rbd_mirror/ImageReplayer.h
+++ b/ceph/src/tools/rbd_mirror/ImageReplayer.h
@@ -101,9 +101,10 @@ public:
     return m_global_image_id;
   }
 
-  void start(Context *on_finish = nullptr, bool manual = false);
+  void start(Context *on_finish = nullptr, bool manual = false,
+             bool restart = false);
   void stop(Context *on_finish = nullptr, bool manual = false,
-           int r = 0, const std::string& desc = "");
+            bool restart = false);
   void restart(Context *on_finish = nullptr);
   void flush();
 
@@ -139,11 +140,11 @@ protected:
    * @endverbatim
    */
 
-  virtual void on_start_fail(int r, const std::string &desc);
-  virtual bool on_start_interrupted();
-  virtual bool on_start_interrupted(ceph::mutex& lock);
+  void on_start_fail(int r, const std::string &desc);
+  bool on_start_interrupted();
+  bool on_start_interrupted(ceph::mutex& lock);
 
-  virtual void on_stop_journal_replay(int r = 0, const std::string &desc = "");
+  void on_stop_journal_replay(int r = 0, const std::string &desc = "");
 
   bool on_replay_interrupted();
 
@@ -205,6 +206,7 @@ private:
   bool m_finished = false;
   bool m_delete_requested = false;
   bool m_resync_requested = false;
+  bool m_restart_requested = false;
 
   image_replayer::StateBuilder<ImageCtxT>* m_state_builder = nullptr;
   image_replayer::Replayer* m_replayer = nullptr;