From a9a84bad431f2d9916bdf88980b1cd2d0e36a1e5 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 26 Jul 2016 20:57:40 -0400 Subject: [PATCH] librbd: remove unused journal replay canceled callback Signed-off-by: Jason Dillaman (cherry picked from commit f453554edcb16ec72714b2456c08bab9e339b1eb) --- src/librbd/journal/Policy.h | 1 - src/librbd/journal/StandardPolicy.cc | 5 ----- src/librbd/journal/StandardPolicy.h | 1 - src/test/librbd/mock/MockJournalPolicy.h | 1 - src/tools/rbd_mirror/ImageDeleter.cc | 4 ---- .../rbd_mirror/image_replayer/OpenLocalImageRequest.cc | 7 ------- 6 files changed, 19 deletions(-) diff --git a/src/librbd/journal/Policy.h b/src/librbd/journal/Policy.h index 85373cd1abc56..2ef21e6fe0e8a 100644 --- a/src/librbd/journal/Policy.h +++ b/src/librbd/journal/Policy.h @@ -16,7 +16,6 @@ struct Policy { virtual bool append_disabled() const = 0; virtual void allocate_tag_on_lock(Context *on_finish) = 0; - virtual void cancel_external_replay(Context *on_finish) = 0; }; } // namespace journal diff --git a/src/librbd/journal/StandardPolicy.cc b/src/librbd/journal/StandardPolicy.cc index 9e718288706e8..5cba7c0201126 100644 --- a/src/librbd/journal/StandardPolicy.cc +++ b/src/librbd/journal/StandardPolicy.cc @@ -25,10 +25,5 @@ void StandardPolicy::allocate_tag_on_lock(Context *on_finish) { m_image_ctx->journal->allocate_local_tag(on_finish); } -void StandardPolicy::cancel_external_replay(Context *on_finish) { - // external replay is only handled by rbd-mirror - assert(false); -} - } // namespace journal } // namespace librbd diff --git a/src/librbd/journal/StandardPolicy.h b/src/librbd/journal/StandardPolicy.h index e2b1ad7bc8359..c2c997c8aecc3 100644 --- a/src/librbd/journal/StandardPolicy.h +++ b/src/librbd/journal/StandardPolicy.h @@ -21,7 +21,6 @@ public: return false; } virtual void allocate_tag_on_lock(Context *on_finish); - virtual void cancel_external_replay(Context *on_finish); private: ImageCtx *m_image_ctx; diff --git a/src/test/librbd/mock/MockJournalPolicy.h b/src/test/librbd/mock/MockJournalPolicy.h index c10fd6fbf1f87..8ad6ff60952ee 100644 --- a/src/test/librbd/mock/MockJournalPolicy.h +++ b/src/test/librbd/mock/MockJournalPolicy.h @@ -13,7 +13,6 @@ struct MockJournalPolicy : public journal::Policy { MOCK_CONST_METHOD0(append_disabled, bool()); MOCK_METHOD1(allocate_tag_on_lock, void(Context*)); - MOCK_METHOD1(cancel_external_replay, void(Context*)); }; diff --git a/src/tools/rbd_mirror/ImageDeleter.cc b/src/tools/rbd_mirror/ImageDeleter.cc index 7c5caee640a23..234c2401ffde9 100644 --- a/src/tools/rbd_mirror/ImageDeleter.cc +++ b/src/tools/rbd_mirror/ImageDeleter.cc @@ -81,10 +81,6 @@ struct DeleteJournalPolicy : public librbd::journal::Policy { virtual void allocate_tag_on_lock(Context *on_finish) { on_finish->complete(0); } - - virtual void cancel_external_replay(Context *on_finish) { - on_finish->complete(0); - } }; } // anonymous namespace diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc index 0286e522664c4..f023f39ac6d75 100644 --- a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc @@ -52,13 +52,6 @@ struct MirrorJournalPolicy : public librbd::journal::Policy { // rbd-mirror will manually create tags by copying them from the peer work_queue->queue(on_finish, 0); } - - virtual void cancel_external_replay(Context *on_finish) { - // TODO: journal is being closed due to a comms error. This means - // the journal is being closed and the exclusive lock is being released. - // ImageReplayer needs to restart. - } - }; } // anonymous namespace -- 2.39.5