From e63b45a4af84de10ff6b35dbb1bcd43f12d2363b Mon Sep 17 00:00:00 2001 From: N Balachandran Date: Tue, 9 Apr 2024 07:56:47 +0530 Subject: [PATCH] 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 --- src/tools/rbd_mirror/ImageReplayer.cc | 10 +++++----- src/tools/rbd_mirror/ImageReplayer.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 1e88c3262f1..438e3c11d06 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -591,12 +591,12 @@ void ImageReplayer::stop(Context *on_finish, bool manual, bool restart) } if (shut_down_replay) { - on_stop_journal_replay(); + on_stop_replay(); } } template -void ImageReplayer::on_stop_journal_replay(int r, const std::string &desc) +void ImageReplayer::on_stop_replay(int r, const std::string &desc) { dout(10) << dendl; @@ -667,7 +667,7 @@ bool ImageReplayer::on_replay_interrupted() } if (shut_down) { - on_stop_journal_replay(); + on_stop_replay(); } return shut_down; } @@ -1050,7 +1050,7 @@ void ImageReplayer::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::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 432fdf22575..de76256798e 100644 --- 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(); -- 2.39.5