rbd_mirror: rename method

Rename on_stop_journal_replay to on_stop_replay as the
function doesn't do anything journal specific.

Signed-off-by: N Balachandran <nibalach@redhat.com>

diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
index 1e88c3262f16f0d72acb905829d2b906faca4eb7..438e3c11d0641242e96c74c33e178f6c3762b1f7 100644 (file)
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -591,12 +591,12 @@ void ImageReplayer<I>::stop(Context *on_finish, bool manual, bool restart)
   }
 
   if (shut_down_replay) {
-    on_stop_journal_replay();
+    on_stop_replay();
   }
 }
 
 template <typename I>
-void ImageReplayer<I>::on_stop_journal_replay(int r, const std::string &desc)
+void ImageReplayer<I>::on_stop_replay(int r, const std::string &desc)
 {
   dout(10) << dendl;
 
@@ -667,7 +667,7 @@ bool ImageReplayer<I>::on_replay_interrupted()
   }
 
   if (shut_down) {
-    on_stop_journal_replay();
+    on_stop_replay();
   }
   return shut_down;
 }
@@ -1050,7 +1050,7 @@ void ImageReplayer<I>::handle_replayer_notification() {
   if (m_replayer->is_resync_requested()) {
     dout(10) << "resync requested" << dendl;
     m_resync_requested = true;
-    on_stop_journal_replay(0, "resync requested");
+    on_stop_replay(0, "resync requested");
     return;
   }
 
@@ -1060,7 +1060,7 @@ void ImageReplayer<I>::handle_replayer_notification() {
     dout(10) << "replay interrupted: "
              << "r=" << error_code << ", "
              << "error=" << error_description << dendl;
-    on_stop_journal_replay(error_code, error_description);
+    on_stop_replay(error_code, error_description);
     return;
   }
 

diff --git a/src/tools/rbd_mirror/ImageReplayer.h b/src/tools/rbd_mirror/ImageReplayer.h
index 432fdf225750c8ddd9461f3cd9908e1cff7db4db..de76256798e3e1641125fe3bd82de0527110c855 100644 (file)
--- a/src/tools/rbd_mirror/ImageReplayer.h
+++ b/src/tools/rbd_mirror/ImageReplayer.h
@@ -127,7 +127,7 @@ protected:
    * REPLAYING
    *    |
    *    v
-   * JOURNAL_REPLAY_SHUT_DOWN
+   * REPLAY_SHUT_DOWN
    *    |
    *    v
    * LOCAL_IMAGE_CLOSE
@@ -142,7 +142,7 @@ protected:
   bool on_start_interrupted();
   bool on_start_interrupted(ceph::mutex& lock);
 
-  void on_stop_journal_replay(int r = 0, const std::string &desc = "");
+  void on_stop_replay(int r = 0, const std::string &desc = "");
 
   bool on_replay_interrupted();