From c33a9b1430f7d56838d4d216bc7dc610c8dd890a Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 20 Jun 2022 17:21:08 +0200 Subject: [PATCH] rbd-mirror: drop m_remote_promotion_state from PrepareReplayRequest Now unused (and if it was used, the entire StateBuilder is passed in anyway). Signed-off-by: Ilya Dryomov (cherry picked from commit adf7f1ee2ef70ca3e728f2c5619668dc38216edf) --- .../journal/test_mock_PrepareReplayRequest.cc | 70 ++++++++----------- .../journal/PrepareReplayRequest.h | 8 +-- .../image_replayer/journal/StateBuilder.cc | 4 +- .../snapshot/PrepareReplayRequest.h | 8 +-- .../image_replayer/snapshot/StateBuilder.cc | 4 +- 5 files changed, 36 insertions(+), 58 deletions(-) diff --git a/src/test/rbd_mirror/image_replayer/journal/test_mock_PrepareReplayRequest.cc b/src/test/rbd_mirror/image_replayer/journal/test_mock_PrepareReplayRequest.cc index c570f69ebf520..4aa9516294d06 100644 --- a/src/test/rbd_mirror/image_replayer/journal/test_mock_PrepareReplayRequest.cc +++ b/src/test/rbd_mirror/image_replayer/journal/test_mock_PrepareReplayRequest.cc @@ -154,12 +154,11 @@ public: MockPrepareReplayRequest* create_request( MockStateBuilder& mock_state_builder, - librbd::mirror::PromotionState remote_promotion_state, const std::string& local_mirror_uuid, bool* resync_requested, bool* syncing, Context* on_finish) { return new MockPrepareReplayRequest( - local_mirror_uuid, remote_promotion_state, nullptr, &mock_state_builder, - resync_requested, syncing, on_finish); + local_mirror_uuid, nullptr, &mock_state_builder, resync_requested, + syncing, on_finish); } librbd::ImageCtx *m_local_image_ctx = nullptr; @@ -204,9 +203,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, Success) { mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(0, ctx.wait()); ASSERT_FALSE(resync_requested); @@ -228,9 +226,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, NoLocalJournal) { mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(-EINVAL, ctx.wait()); } @@ -257,9 +254,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, ResyncRequested) { mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(0, ctx.wait()); ASSERT_TRUE(resync_requested); @@ -286,9 +282,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, ResyncRequestedError) { mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(-EINVAL, ctx.wait()); } @@ -315,9 +310,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, Syncing) { mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(0, ctx.wait()); ASSERT_FALSE(resync_requested); @@ -355,9 +349,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, GetRemoteTagClassError) mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(-EINVAL, ctx.wait()); } @@ -401,9 +394,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, GetRemoteTagsError) { mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(-EINVAL, ctx.wait()); } @@ -472,9 +464,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, LocalDemotedRemoteSynci mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(0, ctx.wait()); ASSERT_FALSE(resync_requested); @@ -520,9 +511,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, UpdateClientError) { mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(0, ctx.wait()); ASSERT_FALSE(resync_requested); @@ -577,9 +567,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, RemoteDemotePromote) { mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(0, ctx.wait()); ASSERT_FALSE(resync_requested); @@ -644,9 +633,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, MultipleRemoteDemotePro mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(0, ctx.wait()); ASSERT_FALSE(resync_requested); @@ -699,9 +687,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, LocalDemoteRemotePromot mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(0, ctx.wait()); ASSERT_FALSE(resync_requested); @@ -752,9 +739,8 @@ TEST_F(TestMockImageReplayerJournalPrepareReplayRequest, SplitBrainForcePromote) mirror_peer_client_meta); bool resync_requested; bool syncing; - auto request = create_request( - mock_state_builder, librbd::mirror::PROMOTION_STATE_PRIMARY, - "local mirror uuid", &resync_requested, &syncing, &ctx); + auto request = create_request(mock_state_builder, "local mirror uuid", + &resync_requested, &syncing, &ctx); request->send(); ASSERT_EQ(-EEXIST, ctx.wait()); } diff --git a/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.h b/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.h index 4538c94a4ad94..2b6fb659be343 100644 --- a/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.h +++ b/src/tools/rbd_mirror/image_replayer/journal/PrepareReplayRequest.h @@ -30,20 +30,18 @@ class PrepareReplayRequest : public BaseRequest { public: static PrepareReplayRequest* create( const std::string& local_mirror_uuid, - librbd::mirror::PromotionState remote_promotion_state, ProgressContext* progress_ctx, StateBuilder* state_builder, bool* resync_requested, bool* syncing, Context* on_finish) { return new PrepareReplayRequest( - local_mirror_uuid, remote_promotion_state, progress_ctx, state_builder, - resync_requested, syncing, on_finish); + local_mirror_uuid, progress_ctx, state_builder, resync_requested, + syncing, on_finish); } PrepareReplayRequest( const std::string& local_mirror_uuid, - librbd::mirror::PromotionState remote_promotion_state, ProgressContext* progress_ctx, StateBuilder* state_builder, bool* resync_requested, @@ -51,7 +49,6 @@ public: Context* on_finish) : BaseRequest(on_finish), m_local_mirror_uuid(local_mirror_uuid), - m_remote_promotion_state(remote_promotion_state), m_progress_ctx(progress_ctx), m_state_builder(state_builder), m_resync_requested(resync_requested), @@ -83,7 +80,6 @@ private: typedef std::list Tags; std::string m_local_mirror_uuid; - librbd::mirror::PromotionState m_remote_promotion_state; ProgressContext* m_progress_ctx; StateBuilder* m_state_builder; bool* m_resync_requested; diff --git a/src/tools/rbd_mirror/image_replayer/journal/StateBuilder.cc b/src/tools/rbd_mirror/image_replayer/journal/StateBuilder.cc index 2c95211d41e12..5f1fb0e2f09fc 100644 --- a/src/tools/rbd_mirror/image_replayer/journal/StateBuilder.cc +++ b/src/tools/rbd_mirror/image_replayer/journal/StateBuilder.cc @@ -97,8 +97,8 @@ BaseRequest* StateBuilder::create_prepare_replay_request( bool* syncing, Context* on_finish) { return PrepareReplayRequest::create( - local_mirror_uuid, this->remote_promotion_state, progress_ctx, this, - resync_requested, syncing, on_finish); + local_mirror_uuid, progress_ctx, this, resync_requested, syncing, + on_finish); } template diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/PrepareReplayRequest.h b/src/tools/rbd_mirror/image_replayer/snapshot/PrepareReplayRequest.h index 315080238f7dc..4e9246acd6a99 100644 --- a/src/tools/rbd_mirror/image_replayer/snapshot/PrepareReplayRequest.h +++ b/src/tools/rbd_mirror/image_replayer/snapshot/PrepareReplayRequest.h @@ -28,20 +28,18 @@ class PrepareReplayRequest : public BaseRequest { public: static PrepareReplayRequest* create( const std::string& local_mirror_uuid, - librbd::mirror::PromotionState remote_promotion_state, ProgressContext* progress_ctx, StateBuilder* state_builder, bool* resync_requested, bool* syncing, Context* on_finish) { return new PrepareReplayRequest( - local_mirror_uuid, remote_promotion_state, progress_ctx, state_builder, - resync_requested, syncing, on_finish); + local_mirror_uuid, progress_ctx, state_builder, resync_requested, + syncing, on_finish); } PrepareReplayRequest( const std::string& local_mirror_uuid, - librbd::mirror::PromotionState remote_promotion_state, ProgressContext* progress_ctx, StateBuilder* state_builder, bool* resync_requested, @@ -49,7 +47,6 @@ public: Context* on_finish) : BaseRequest(on_finish), m_local_mirror_uuid(local_mirror_uuid), - m_remote_promotion_state(remote_promotion_state), m_progress_ctx(progress_ctx), m_state_builder(state_builder), m_resync_requested(resync_requested), @@ -75,7 +72,6 @@ private: */ std::string m_local_mirror_uuid; - librbd::mirror::PromotionState m_remote_promotion_state; ProgressContext* m_progress_ctx; StateBuilder* m_state_builder; bool* m_resync_requested; diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/StateBuilder.cc b/src/tools/rbd_mirror/image_replayer/snapshot/StateBuilder.cc index 52e64e762f5f1..ca3e6918babc8 100644 --- a/src/tools/rbd_mirror/image_replayer/snapshot/StateBuilder.cc +++ b/src/tools/rbd_mirror/image_replayer/snapshot/StateBuilder.cc @@ -96,8 +96,8 @@ BaseRequest* StateBuilder::create_prepare_replay_request( bool* syncing, Context* on_finish) { return PrepareReplayRequest::create( - local_mirror_uuid, this->remote_promotion_state, progress_ctx, this, - resync_requested, syncing, on_finish); + local_mirror_uuid, progress_ctx, this, resync_requested, syncing, + on_finish); } template -- 2.39.5