From 0088fa383559651ec77764b0ff0e25bc7f3d274f Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 16 Jan 2020 08:50:13 -0500 Subject: [PATCH] rbd-mirror: removed peer ping from mirror status updater This ping is now handled by the remote pool poller class. Signed-off-by: Jason Dillaman --- src/test/rbd_mirror/test_ImageReplayer.cc | 2 +- .../test_mock_MirrorStatusUpdater.cc | 53 +++++++------------ .../rbd_mirror/test_mock_NamespaceReplayer.cc | 33 ++++++------ src/test/rbd_mirror/test_mock_PoolReplayer.cc | 1 - src/tools/rbd_mirror/MirrorStatusUpdater.cc | 18 ++----- src/tools/rbd_mirror/MirrorStatusUpdater.h | 6 +-- src/tools/rbd_mirror/NamespaceReplayer.cc | 12 ++--- src/tools/rbd_mirror/NamespaceReplayer.h | 12 ++--- src/tools/rbd_mirror/PoolReplayer.cc | 12 ++--- 9 files changed, 58 insertions(+), 91 deletions(-) diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc index d06ba43c1d0..0a2456566be 100644 --- a/src/test/rbd_mirror/test_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_ImageReplayer.cc @@ -132,7 +132,7 @@ public: EXPECT_EQ(0, m_local_ioctx.create(RBD_MIRRORING, false)); m_local_status_updater = rbd::mirror::MirrorStatusUpdater<>::create( - m_local_ioctx, m_threads.get(), "", ""); + m_local_ioctx, m_threads.get(), ""); C_SaferCond status_updater_ctx; m_local_status_updater->init(&status_updater_ctx); EXPECT_EQ(0, status_updater_ctx.wait()); diff --git a/src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc b/src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc index 8964d7a84ec..ca3f8dd7976 100644 --- a/src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc +++ b/src/test/rbd_mirror/test_mock_MirrorStatusUpdater.cc @@ -168,7 +168,7 @@ public: void expect_mirror_status_update( const MirrorImageSiteStatuses& mirror_image_site_statuses, - const std::string& site_name, const std::string& fsid, int r) { + const std::string& fsid, int r) { EXPECT_CALL(*m_mock_local_io_ctx, aio_operate(_, _, _, _, _)) .WillOnce(Invoke([this](auto&&... args) { int r = m_mock_local_io_ctx->do_aio_operate(decltype(args)(args)...); @@ -176,18 +176,6 @@ public: return r; })); - if (!site_name.empty()) { - // status updates to remote site include ping - bufferlist in_bl; - encode(site_name, in_bl); - encode(fsid, in_bl); - encode(static_cast(cls::rbd::MIRROR_PEER_DIRECTION_TX), in_bl); - EXPECT_CALL(*m_mock_local_io_ctx, - exec(RBD_MIRRORING, _, StrEq("rbd"), - StrEq("mirror_peer_ping"), ContentsEqual(in_bl), _, _)) - .WillOnce(Return(0)); - } - for (auto [global_image_id, mirror_image_status] : mirror_image_site_statuses) { mirror_image_status.fsid = fsid; @@ -247,7 +235,7 @@ public: TEST_F(TestMockMirrorStatusUpdater, InitShutDown) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -261,7 +249,7 @@ TEST_F(TestMockMirrorStatusUpdater, InitShutDown) { TEST_F(TestMockMirrorStatusUpdater, InitStatusWatcherError) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -278,7 +266,7 @@ TEST_F(TestMockMirrorStatusUpdater, InitStatusWatcherError) { TEST_F(TestMockMirrorStatusUpdater, ShutDownStatusWatcherError) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -297,7 +285,7 @@ TEST_F(TestMockMirrorStatusUpdater, ShutDownStatusWatcherError) { TEST_F(TestMockMirrorStatusUpdater, SmallBatch) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -319,7 +307,7 @@ TEST_F(TestMockMirrorStatusUpdater, SmallBatch) { Context* update_task = nullptr; fire_timer_event(&timer_event, &update_task); - expect_mirror_status_update(mirror_image_site_statuses, "", "", 0); + expect_mirror_status_update(mirror_image_site_statuses, "", 0); update_task->complete(0); shut_down_mirror_status_updater(mock_mirror_status_updater, @@ -328,7 +316,7 @@ TEST_F(TestMockMirrorStatusUpdater, SmallBatch) { TEST_F(TestMockMirrorStatusUpdater, LargeBatch) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -359,8 +347,8 @@ TEST_F(TestMockMirrorStatusUpdater, LargeBatch) { Context* update_task = nullptr; fire_timer_event(&timer_event, &update_task); - expect_mirror_status_update(mirror_image_site_statuses_1, "", "", 0); - expect_mirror_status_update(mirror_image_site_statuses_2, "", "", 0); + expect_mirror_status_update(mirror_image_site_statuses_1, "", 0); + expect_mirror_status_update(mirror_image_site_statuses_2, "", 0); update_task->complete(0); shut_down_mirror_status_updater(mock_mirror_status_updater, @@ -369,7 +357,7 @@ TEST_F(TestMockMirrorStatusUpdater, LargeBatch) { TEST_F(TestMockMirrorStatusUpdater, OverwriteStatus) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -390,7 +378,7 @@ TEST_F(TestMockMirrorStatusUpdater, OverwriteStatus) { expect_mirror_status_update( {{"1", cls::rbd::MirrorImageSiteStatus{ "", cls::rbd::MIRROR_IMAGE_STATUS_STATE_REPLAYING, "description"}}}, - "", "", 0); + "", 0); update_task->complete(0); shut_down_mirror_status_updater(mock_mirror_status_updater, @@ -399,7 +387,7 @@ TEST_F(TestMockMirrorStatusUpdater, OverwriteStatus) { TEST_F(TestMockMirrorStatusUpdater, OverwriteStatusInFlight) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -430,7 +418,7 @@ TEST_F(TestMockMirrorStatusUpdater, OverwriteStatusInFlight) { expect_mirror_status_update( {{"1", cls::rbd::MirrorImageSiteStatus{ "", cls::rbd::MIRROR_IMAGE_STATUS_STATE_REPLAYING, "description"}}}, - "", "", 0); + "", 0); update_task->complete(0); @@ -440,7 +428,7 @@ TEST_F(TestMockMirrorStatusUpdater, OverwriteStatusInFlight) { TEST_F(TestMockMirrorStatusUpdater, ImmediateUpdate) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -452,7 +440,7 @@ TEST_F(TestMockMirrorStatusUpdater, ImmediateUpdate) { expect_work_queue(false); expect_mirror_status_update({{"1", cls::rbd::MirrorImageSiteStatus{}}}, - "", "", 0); + "", 0); mock_mirror_status_updater.set_mirror_image_status("1", {}, true); shut_down_mirror_status_updater(mock_mirror_status_updater, @@ -461,7 +449,7 @@ TEST_F(TestMockMirrorStatusUpdater, ImmediateUpdate) { TEST_F(TestMockMirrorStatusUpdater, RemoveIdleStatus) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -484,7 +472,7 @@ TEST_F(TestMockMirrorStatusUpdater, RemoveIdleStatus) { TEST_F(TestMockMirrorStatusUpdater, RemoveInFlightStatus) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -518,7 +506,7 @@ TEST_F(TestMockMirrorStatusUpdater, RemoveInFlightStatus) { TEST_F(TestMockMirrorStatusUpdater, ShutDownWhileUpdating) { MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "", ""); + m_mock_threads, ""); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -557,8 +545,7 @@ TEST_F(TestMockMirrorStatusUpdater, MirrorPeerSitePing) { ASSERT_EQ(0, _rados->cluster_fsid(&fsid)); MockMirrorStatusUpdater mock_mirror_status_updater(m_local_io_ctx, - m_mock_threads, "siteA", - fsid); + m_mock_threads, fsid); MockMirrorStatusWatcher* mock_mirror_status_watcher = new MockMirrorStatusWatcher(); @@ -580,7 +567,7 @@ TEST_F(TestMockMirrorStatusUpdater, MirrorPeerSitePing) { Context* update_task = nullptr; fire_timer_event(&timer_event, &update_task); - expect_mirror_status_update(mirror_image_site_statuses, "siteA", fsid, 0); + expect_mirror_status_update(mirror_image_site_statuses, fsid, 0); update_task->complete(0); shut_down_mirror_status_updater(mock_mirror_status_updater, diff --git a/src/test/rbd_mirror/test_mock_NamespaceReplayer.cc b/src/test/rbd_mirror/test_mock_NamespaceReplayer.cc index e395bf3d237..99f27237ad9 100644 --- a/src/test/rbd_mirror/test_mock_NamespaceReplayer.cc +++ b/src/test/rbd_mirror/test_mock_NamespaceReplayer.cc @@ -175,14 +175,13 @@ struct MirrorStatusUpdater { static MirrorStatusUpdater *create(librados::IoCtx &io_ctx, Threads *threads, - const std::string& site_name, const std::string& fsid) { - ceph_assert(s_instance[site_name] != nullptr); - return s_instance[site_name]; + ceph_assert(s_instance[fsid] != nullptr); + return s_instance[fsid]; } - MirrorStatusUpdater(const std::string& site_name) { - s_instance[site_name] = this; + MirrorStatusUpdater(const std::string_view& fsid) { + s_instance[std::string{fsid}] = this; } MOCK_METHOD1(init, void(Context *)); @@ -264,6 +263,8 @@ using ::testing::WithArg; class TestMockNamespaceReplayer : public TestMockFixture { public: + static constexpr const std::string_view FSID = "00000000-1111-2222-3333-444444444444"; + typedef NamespaceReplayer MockNamespaceReplayer; typedef ImageDeleter MockImageDeleter; typedef ImageMap MockImageMap; @@ -397,7 +398,7 @@ TEST_F(TestMockNamespaceReplayer, Init_LocalMirrorStatusUpdaterError) { MockNamespaceReplayer namespace_replayer( {}, m_local_io_ctx, m_remote_io_ctx, "local mirror uuid", - "siteA", "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, + "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, nullptr, nullptr, nullptr, nullptr); C_SaferCond on_init; @@ -411,7 +412,7 @@ TEST_F(TestMockNamespaceReplayer, Init_RemoteMirrorStatusUpdaterError) { auto mock_local_mirror_status_updater = new MockMirrorStatusUpdater{""}; expect_mirror_status_updater_init(*mock_local_mirror_status_updater, 0); - auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{"siteA"}; + auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{FSID}; expect_mirror_status_updater_init(*mock_remote_mirror_status_updater, -EINVAL); @@ -419,7 +420,7 @@ TEST_F(TestMockNamespaceReplayer, Init_RemoteMirrorStatusUpdaterError) { MockNamespaceReplayer namespace_replayer( {}, m_local_io_ctx, m_remote_io_ctx, "local mirror uuid", - "siteA", "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, + "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, nullptr, nullptr, nullptr, nullptr); C_SaferCond on_init; @@ -433,7 +434,7 @@ TEST_F(TestMockNamespaceReplayer, Init_InstanceReplayerError) { auto mock_local_mirror_status_updater = new MockMirrorStatusUpdater{""}; expect_mirror_status_updater_init(*mock_local_mirror_status_updater, 0); - auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{"siteA"}; + auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{FSID}; expect_mirror_status_updater_init(*mock_remote_mirror_status_updater, 0); auto mock_instance_replayer = new MockInstanceReplayer(); @@ -444,7 +445,7 @@ TEST_F(TestMockNamespaceReplayer, Init_InstanceReplayerError) { MockNamespaceReplayer namespace_replayer( {}, m_local_io_ctx, m_remote_io_ctx, "local mirror uuid", - "siteA", "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, + "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, nullptr, nullptr, nullptr, nullptr); C_SaferCond on_init; @@ -458,7 +459,7 @@ TEST_F(TestMockNamespaceReplayer, Init_InstanceWatcherError) { auto mock_local_mirror_status_updater = new MockMirrorStatusUpdater{""}; expect_mirror_status_updater_init(*mock_local_mirror_status_updater, 0); - auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{"siteA"}; + auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{FSID}; expect_mirror_status_updater_init(*mock_remote_mirror_status_updater, 0); auto mock_instance_replayer = new MockInstanceReplayer(); @@ -474,7 +475,7 @@ TEST_F(TestMockNamespaceReplayer, Init_InstanceWatcherError) { MockNamespaceReplayer namespace_replayer( {}, m_local_io_ctx, m_remote_io_ctx, "local mirror uuid", - "siteA", "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, + "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, nullptr, nullptr, nullptr, nullptr); C_SaferCond on_init; @@ -488,7 +489,7 @@ TEST_F(TestMockNamespaceReplayer, Init) { auto mock_local_mirror_status_updater = new MockMirrorStatusUpdater{""}; expect_mirror_status_updater_init(*mock_local_mirror_status_updater, 0); - auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{"siteA"}; + auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{FSID}; expect_mirror_status_updater_init(*mock_remote_mirror_status_updater, 0); auto mock_instance_replayer = new MockInstanceReplayer(); @@ -501,7 +502,7 @@ TEST_F(TestMockNamespaceReplayer, Init) { MockServiceDaemon mock_service_daemon; MockNamespaceReplayer namespace_replayer( {}, m_local_io_ctx, m_remote_io_ctx, "local mirror uuid", - "siteA", "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, + "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, nullptr, nullptr, &mock_service_daemon, nullptr); C_SaferCond on_init; @@ -527,7 +528,7 @@ TEST_F(TestMockNamespaceReplayer, AcuqireLeader) { auto mock_local_mirror_status_updater = new MockMirrorStatusUpdater{""}; expect_mirror_status_updater_init(*mock_local_mirror_status_updater, 0); - auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{"siteA"}; + auto mock_remote_mirror_status_updater = new MockMirrorStatusUpdater{FSID}; expect_mirror_status_updater_init(*mock_remote_mirror_status_updater, 0); auto mock_instance_replayer = new MockInstanceReplayer(); @@ -540,7 +541,7 @@ TEST_F(TestMockNamespaceReplayer, AcuqireLeader) { MockServiceDaemon mock_service_daemon; MockNamespaceReplayer namespace_replayer( {}, m_local_io_ctx, m_remote_io_ctx, "local mirror uuid", - "siteA", "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, + "local peer uuid", {"remote mirror uuid", ""}, m_mock_threads, nullptr, nullptr, &mock_service_daemon, nullptr); C_SaferCond on_init; diff --git a/src/test/rbd_mirror/test_mock_PoolReplayer.cc b/src/test/rbd_mirror/test_mock_PoolReplayer.cc index 1d27fd0b1ea..2c46c1af5f9 100644 --- a/src/test/rbd_mirror/test_mock_PoolReplayer.cc +++ b/src/test/rbd_mirror/test_mock_PoolReplayer.cc @@ -132,7 +132,6 @@ struct NamespaceReplayer { librados::IoCtx &local_ioctx, librados::IoCtx &remote_ioctx, const std::string &local_mirror_uuid, - const std::string &site_name, const std::string& local_mirror_peer_uuid, const RemotePoolMeta& remote_pool_meta, Threads *threads, diff --git a/src/tools/rbd_mirror/MirrorStatusUpdater.cc b/src/tools/rbd_mirror/MirrorStatusUpdater.cc index ecd544d9b24..29dd095c6bd 100644 --- a/src/tools/rbd_mirror/MirrorStatusUpdater.cc +++ b/src/tools/rbd_mirror/MirrorStatusUpdater.cc @@ -30,13 +30,11 @@ using librbd::util::create_rados_callback; template MirrorStatusUpdater::MirrorStatusUpdater( - librados::IoCtx& io_ctx, Threads *threads, - const std::string& site_name, const std::string& fsid) - : m_io_ctx(io_ctx), m_threads(threads), m_site_name(site_name), - m_fsid(fsid), m_lock(ceph::make_mutex("rbd::mirror::MirrorStatusUpdater " + - stringify(m_io_ctx.get_id()))) { - dout(10) << "site_name=" << site_name << ", " - << "fsid=" << fsid << ", " + librados::IoCtx& io_ctx, Threads *threads, const std::string& fsid) + : m_io_ctx(io_ctx), m_threads(threads), m_fsid(fsid), + m_lock(ceph::make_mutex("rbd::mirror::MirrorStatusUpdater " + + stringify(m_io_ctx.get_id()))) { + dout(10) << "fsid=" << fsid << ", " << "pool_id=" << m_io_ctx.get_id() << dendl; } @@ -302,12 +300,6 @@ void MirrorStatusUpdater::update_task(int r) { librados::ObjectWriteOperation op; uint32_t op_count = 0; - if (!m_site_name.empty()) { - // updates to remote sites should include local site name - // to ensure status includes this peer - librbd::cls_client::mirror_peer_ping(&op, m_site_name, m_fsid); - } - while (it != updating_global_image_ids.end() && op_count < MAX_UPDATES_PER_OP) { auto& global_image_id = *it; diff --git a/src/tools/rbd_mirror/MirrorStatusUpdater.h b/src/tools/rbd_mirror/MirrorStatusUpdater.h index 7615cc4c8f5..ca443c0aaab 100644 --- a/src/tools/rbd_mirror/MirrorStatusUpdater.h +++ b/src/tools/rbd_mirror/MirrorStatusUpdater.h @@ -27,13 +27,12 @@ public: static MirrorStatusUpdater* create(librados::IoCtx& io_ctx, Threads *threads, - const std::string& site_name, const std::string& fsid) { - return new MirrorStatusUpdater(io_ctx, threads, site_name, fsid); + return new MirrorStatusUpdater(io_ctx, threads, fsid); } MirrorStatusUpdater(librados::IoCtx& io_ctx, Threads *threads, - const std::string& site_name, const std::string& fsid); + const std::string& fsid); ~MirrorStatusUpdater(); void init(Context* on_finish); @@ -71,7 +70,6 @@ private: librados::IoCtx m_io_ctx; Threads* m_threads; - std::string m_site_name; std::string m_fsid; Context* m_timer_task = nullptr; diff --git a/src/tools/rbd_mirror/NamespaceReplayer.cc b/src/tools/rbd_mirror/NamespaceReplayer.cc index 437c939fc52..77bc7c626ee 100644 --- a/src/tools/rbd_mirror/NamespaceReplayer.cc +++ b/src/tools/rbd_mirror/NamespaceReplayer.cc @@ -38,7 +38,7 @@ template NamespaceReplayer::NamespaceReplayer( const std::string &name, librados::IoCtx &local_io_ctx, librados::IoCtx &remote_io_ctx, - const std::string &local_mirror_uuid, const std::string &local_site_name, + const std::string &local_mirror_uuid, const std::string& local_mirror_peer_uuid, const RemotePoolMeta& remote_pool_meta, Threads *threads, Throttler *image_sync_throttler, Throttler *image_deletion_throttler, @@ -46,7 +46,6 @@ NamespaceReplayer::NamespaceReplayer( journal::CacheManagerHandler *cache_manager_handler) : m_namespace_name(name), m_local_mirror_uuid(local_mirror_uuid), - m_local_site_name(local_site_name), m_local_mirror_peer_uuid(local_mirror_peer_uuid), m_remote_pool_meta(remote_pool_meta), m_threads(threads), m_image_sync_throttler(image_sync_throttler), @@ -265,7 +264,7 @@ void NamespaceReplayer::init_local_status_updater() { ceph_assert(!m_local_status_updater); m_local_status_updater.reset(MirrorStatusUpdater::create( - m_local_io_ctx, m_threads, "", "")); + m_local_io_ctx, m_threads, "")); auto ctx = create_context_callback< NamespaceReplayer, &NamespaceReplayer::handle_init_local_status_updater>(this); @@ -300,11 +299,6 @@ void NamespaceReplayer::init_remote_status_updater() { ceph_assert(ceph_mutex_is_locked(m_lock)); ceph_assert(!m_remote_status_updater); - std::string local_site_name; - if (m_namespace_name.empty()) { - local_site_name = m_local_site_name; - } - librados::Rados rados(m_local_io_ctx); std::string local_fsid; int r = rados.cluster_fsid(&local_fsid); @@ -316,7 +310,7 @@ void NamespaceReplayer::init_remote_status_updater() { } m_remote_status_updater.reset(MirrorStatusUpdater::create( - m_remote_io_ctx, m_threads, local_site_name, local_fsid)); + m_remote_io_ctx, m_threads, local_fsid)); auto ctx = create_context_callback< NamespaceReplayer, &NamespaceReplayer::handle_init_remote_status_updater>(this); diff --git a/src/tools/rbd_mirror/NamespaceReplayer.h b/src/tools/rbd_mirror/NamespaceReplayer.h index be12f6af07e..0d5e0a95c27 100644 --- a/src/tools/rbd_mirror/NamespaceReplayer.h +++ b/src/tools/rbd_mirror/NamespaceReplayer.h @@ -47,7 +47,6 @@ public: librados::IoCtx &local_ioctx, librados::IoCtx &remote_ioctx, const std::string &local_mirror_uuid, - const std::string &local_site_name, const std::string &local_mirror_peer_uuid, const RemotePoolMeta& remote_pool_meta, Threads *threads, @@ -56,18 +55,16 @@ public: ServiceDaemon *service_daemon, journal::CacheManagerHandler *cache_manager_handler) { return new NamespaceReplayer(name, local_ioctx, remote_ioctx, - local_mirror_uuid, local_site_name, - local_mirror_peer_uuid, remote_pool_meta, - threads, image_sync_throttler, - image_deletion_throttler, service_daemon, - cache_manager_handler); + local_mirror_uuid, local_mirror_peer_uuid, + remote_pool_meta, threads, + image_sync_throttler, image_deletion_throttler, + service_daemon, cache_manager_handler); } NamespaceReplayer(const std::string &name, librados::IoCtx &local_ioctx, librados::IoCtx &remote_ioctx, const std::string &local_mirror_uuid, - const std::string &local_site_name, const std::string& local_mirror_peer_uuid, const RemotePoolMeta& remote_pool_meta, Threads *threads, @@ -267,7 +264,6 @@ private: librados::IoCtx m_local_io_ctx; librados::IoCtx m_remote_io_ctx; std::string m_local_mirror_uuid; - std::string m_local_site_name; std::string m_local_mirror_peer_uuid; RemotePoolMeta m_remote_pool_meta; Threads *m_threads; diff --git a/src/tools/rbd_mirror/PoolReplayer.cc b/src/tools/rbd_mirror/PoolReplayer.cc index b48a5debf10..11623e2a3c4 100644 --- a/src/tools/rbd_mirror/PoolReplayer.cc +++ b/src/tools/rbd_mirror/PoolReplayer.cc @@ -362,8 +362,8 @@ void PoolReplayer::init(const std::string& site_name) { ceph_assert(!m_remote_pool_meta.mirror_uuid.empty()); m_default_namespace_replayer.reset(NamespaceReplayer::create( - "", m_local_io_ctx, m_remote_io_ctx, m_local_mirror_uuid, m_site_name, - m_peer.uuid, m_remote_pool_meta, m_threads, m_image_sync_throttler.get(), + "", m_local_io_ctx, m_remote_io_ctx, m_local_mirror_uuid, m_peer.uuid, + m_remote_pool_meta, m_threads, m_image_sync_throttler.get(), m_image_deletion_throttler.get(), m_service_daemon, m_cache_manager_handler)); @@ -654,10 +654,10 @@ void PoolReplayer::update_namespace_replayers() { for (auto &name : mirroring_namespaces) { auto namespace_replayer = NamespaceReplayer::create( - name, m_local_io_ctx, m_remote_io_ctx, m_local_mirror_uuid, m_site_name, - m_peer.uuid, m_remote_pool_meta, m_threads, - m_image_sync_throttler.get(), m_image_deletion_throttler.get(), - m_service_daemon, m_cache_manager_handler); + name, m_local_io_ctx, m_remote_io_ctx, m_local_mirror_uuid, m_peer.uuid, + m_remote_pool_meta, m_threads, m_image_sync_throttler.get(), + m_image_deletion_throttler.get(), m_service_daemon, + m_cache_manager_handler); auto on_init = new LambdaContext( [this, namespace_replayer, name, &mirroring_namespaces, ctx=gather_ctx->new_sub()](int r) { -- 2.39.5