From f7f6b5d12525f5cd9b8f65d41662ad7655b26d64 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Fri, 6 Dec 2019 21:50:15 -0500 Subject: [PATCH] rbd-mirror: drop 'using namespace' in image replayer state machine This is going to cause conflicts w/ the '::journal' namespace and future 'rbd::mirror::image_replayer::journal' namespace. Signed-off-by: Jason Dillaman --- .../rbd_mirror/test_mock_ImageReplayer.cc | 34 +++++++++---------- src/tools/rbd_mirror/ImageReplayer.cc | 21 ++++++------ 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc index 8971af04bc66e..310e17b0c2b98 100644 --- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc @@ -120,17 +120,6 @@ class InstanceWatcher { namespace image_replayer { -using ::testing::_; -using ::testing::AtLeast; -using ::testing::DoAll; -using ::testing::InSequence; -using ::testing::Invoke; -using ::testing::MatcherCast; -using ::testing::Return; -using ::testing::ReturnArg; -using ::testing::SetArgPointee; -using ::testing::WithArg; - template<> struct PrepareLocalImageRequest { static PrepareLocalImageRequest* s_instance; @@ -353,17 +342,28 @@ ReplayStatusFormatter* ReplayStatusFormatter MockThreads; typedef ImageDeleter MockImageDeleter; typedef MirrorStatusUpdater MockMirrorStatusUpdater; - typedef BootstrapRequest MockBootstrapRequest; - typedef CloseImageRequest MockCloseImageRequest; - typedef EventPreprocessor MockEventPreprocessor; - typedef PrepareLocalImageRequest MockPrepareLocalImageRequest; - typedef PrepareRemoteImageRequest MockPrepareRemoteImageRequest; - typedef ReplayStatusFormatter MockReplayStatusFormatter; + typedef image_replayer::BootstrapRequest MockBootstrapRequest; + typedef image_replayer::CloseImageRequest MockCloseImageRequest; + typedef image_replayer::EventPreprocessor MockEventPreprocessor; + typedef image_replayer::PrepareLocalImageRequest MockPrepareLocalImageRequest; + typedef image_replayer::PrepareRemoteImageRequest MockPrepareRemoteImageRequest; + typedef image_replayer::ReplayStatusFormatter MockReplayStatusFormatter; typedef librbd::journal::Replay MockReplay; typedef ImageReplayer MockImageReplayer; typedef InstanceWatcher MockInstanceWatcher; diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 4b6b73180c08e..e08e4dde00acd 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -52,7 +52,6 @@ namespace mirror { using librbd::util::create_async_context_callback; using librbd::util::create_context_callback; using librbd::util::create_rados_callback; -using namespace rbd::mirror::image_replayer; template std::ostream &operator<<(std::ostream &os, @@ -381,7 +380,7 @@ void ImageReplayer::prepare_local_image() { m_local_image_id = ""; Context *ctx = create_context_callback< ImageReplayer, &ImageReplayer::handle_prepare_local_image>(this); - auto req = PrepareLocalImageRequest::create( + auto req = image_replayer::PrepareLocalImageRequest::create( m_local_io_ctx, m_global_image_id, &m_local_image_id, &m_local_image_name, &m_local_image_tag_owner, m_threads->work_queue, ctx); req->send(); @@ -424,7 +423,7 @@ void ImageReplayer::prepare_remote_image() { Context *ctx = create_context_callback< ImageReplayer, &ImageReplayer::handle_prepare_remote_image>(this); - auto req = PrepareRemoteImageRequest::create( + auto req = image_replayer::PrepareRemoteImageRequest::create( m_threads, m_remote_image.io_ctx, m_global_image_id, m_local_mirror_uuid, m_local_image_id, journal_settings, m_cache_manager_handler, &m_remote_image.mirror_uuid, &m_remote_image.image_id, &m_remote_journaler, @@ -478,7 +477,7 @@ void ImageReplayer::bootstrap() { return; } - BootstrapRequest *request = nullptr; + image_replayer::BootstrapRequest *request = nullptr; { std::lock_guard locker{m_lock}; if (on_start_interrupted(m_lock)) { @@ -487,7 +486,7 @@ void ImageReplayer::bootstrap() { auto ctx = create_context_callback< ImageReplayer, &ImageReplayer::handle_bootstrap>(this); - request = BootstrapRequest::create( + request = image_replayer::BootstrapRequest::create( m_threads, m_local_io_ctx, m_remote_image.io_ctx, m_instance_watcher, &m_local_image_ctx, m_local_image_id, m_remote_image.image_id, m_global_image_id, m_local_mirror_uuid, m_remote_image.mirror_uuid, @@ -622,8 +621,8 @@ void ImageReplayer::handle_start_replay(int r) { return; } - m_replay_status_formatter = - ReplayStatusFormatter::create(m_remote_journaler, m_local_mirror_uuid); + m_replay_status_formatter = image_replayer::ReplayStatusFormatter::create( + m_remote_journaler, m_local_mirror_uuid); Context *on_finish(nullptr); { @@ -633,7 +632,7 @@ void ImageReplayer::handle_start_replay(int r) { std::swap(m_on_start_finish, on_finish); } - m_event_preprocessor = EventPreprocessor::create( + m_event_preprocessor = image_replayer::EventPreprocessor::create( *m_local_image_ctx, *m_remote_journaler, m_local_mirror_uuid, &m_client_meta, m_threads->work_queue); @@ -1526,7 +1525,7 @@ void ImageReplayer::shut_down(int r) { // close the local image (release exclusive lock) if (m_local_image_ctx) { ctx = new LambdaContext([this, ctx](int r) { - CloseImageRequest *request = CloseImageRequest::create( + auto request = image_replayer::CloseImageRequest::create( &m_local_image_ctx, ctx); request->send(); }); @@ -1543,7 +1542,7 @@ void ImageReplayer::shut_down(int r) { m_local_journal->stop_external_replay(); m_local_replay = nullptr; - EventPreprocessor::destroy(m_event_preprocessor); + image_replayer::EventPreprocessor::destroy(m_event_preprocessor); m_event_preprocessor = nullptr; ctx->complete(0); }); @@ -1644,7 +1643,7 @@ void ImageReplayer::handle_shut_down(int r) { } dout(10) << "stop complete" << dendl; - ReplayStatusFormatter::destroy(m_replay_status_formatter); + image_replayer::ReplayStatusFormatter::destroy(m_replay_status_formatter); m_replay_status_formatter = nullptr; Context *on_start = nullptr; -- 2.39.5