Skip to content

Commit e63b45a

Browse files
committed
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 <[email protected]>
1 parent 7cc08bf commit e63b45a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/tools/rbd_mirror/ImageReplayer.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -591,12 +591,12 @@ void ImageReplayer<I>::stop(Context *on_finish, bool manual, bool restart)
591591
}
592592

593593
if (shut_down_replay) {
594-
on_stop_journal_replay();
594+
on_stop_replay();
595595
}
596596
}
597597

598598
template <typename I>
599-
void ImageReplayer<I>::on_stop_journal_replay(int r, const std::string &desc)
599+
void ImageReplayer<I>::on_stop_replay(int r, const std::string &desc)
600600
{
601601
dout(10) << dendl;
602602

@@ -667,7 +667,7 @@ bool ImageReplayer<I>::on_replay_interrupted()
667667
}
668668

669669
if (shut_down) {
670-
on_stop_journal_replay();
670+
on_stop_replay();
671671
}
672672
return shut_down;
673673
}
@@ -1050,7 +1050,7 @@ void ImageReplayer<I>::handle_replayer_notification() {
10501050
if (m_replayer->is_resync_requested()) {
10511051
dout(10) << "resync requested" << dendl;
10521052
m_resync_requested = true;
1053-
on_stop_journal_replay(0, "resync requested");
1053+
on_stop_replay(0, "resync requested");
10541054
return;
10551055
}
10561056

@@ -1060,7 +1060,7 @@ void ImageReplayer<I>::handle_replayer_notification() {
10601060
dout(10) << "replay interrupted: "
10611061
<< "r=" << error_code << ", "
10621062
<< "error=" << error_description << dendl;
1063-
on_stop_journal_replay(error_code, error_description);
1063+
on_stop_replay(error_code, error_description);
10641064
return;
10651065
}
10661066

src/tools/rbd_mirror/ImageReplayer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class ImageReplayer {
127127
* REPLAYING
128128
* |
129129
* v
130-
* JOURNAL_REPLAY_SHUT_DOWN
130+
* REPLAY_SHUT_DOWN
131131
* |
132132
* v
133133
* LOCAL_IMAGE_CLOSE
@@ -142,7 +142,7 @@ class ImageReplayer {
142142
bool on_start_interrupted();
143143
bool on_start_interrupted(ceph::mutex& lock);
144144

145-
void on_stop_journal_replay(int r = 0, const std::string &desc = "");
145+
void on_stop_replay(int r = 0, const std::string &desc = "");
146146

147147
bool on_replay_interrupted();
148148

0 commit comments

Comments
 (0)