]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-mirror: moved event pre-processor to sub-namespace
authorJason Dillaman <dillaman@redhat.com>
Sat, 7 Dec 2019 03:38:33 +0000 (22:38 -0500)
committerJason Dillaman <dillaman@redhat.com>
Mon, 16 Dec 2019 01:03:36 +0000 (20:03 -0500)
The current implementation is tied to journal-based replaying so
move it down into the journal sub-namespace.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/test/rbd_mirror/CMakeLists.txt
src/test/rbd_mirror/image_replayer/journal/test_mock_EventPreprocessor.cc [new file with mode: 0644]
src/test/rbd_mirror/image_replayer/test_mock_EventPreprocessor.cc [deleted file]
src/test/rbd_mirror/test_mock_ImageReplayer.cc
src/tools/rbd_mirror/CMakeLists.txt
src/tools/rbd_mirror/ImageReplayer.cc
src/tools/rbd_mirror/ImageReplayer.h
src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc [deleted file]
src/tools/rbd_mirror/image_replayer/EventPreprocessor.h [deleted file]
src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc [new file with mode: 0644]
src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.h [new file with mode: 0644]

index 3c40aaa87988bf4055f1526f03ab903983a40a9f..c769426ba52b2c43803e80fba50100b3e11c0192 100644 (file)
@@ -35,10 +35,10 @@ add_executable(unittest_rbd_mirror
   image_deleter/test_mock_TrashWatcher.cc
   image_replayer/test_mock_BootstrapRequest.cc
   image_replayer/test_mock_CreateImageRequest.cc
-  image_replayer/test_mock_EventPreprocessor.cc
   image_replayer/test_mock_GetMirrorImageIdRequest.cc
   image_replayer/test_mock_PrepareLocalImageRequest.cc
   image_replayer/test_mock_PrepareRemoteImageRequest.cc
+  image_replayer/journal/test_mock_EventPreprocessor.cc
   image_sync/test_mock_SyncPointCreateRequest.cc
   image_sync/test_mock_SyncPointPruneRequest.cc
   pool_watcher/test_mock_RefreshImagesRequest.cc
diff --git a/src/test/rbd_mirror/image_replayer/journal/test_mock_EventPreprocessor.cc b/src/test/rbd_mirror/image_replayer/journal/test_mock_EventPreprocessor.cc
new file mode 100644 (file)
index 0000000..ad00552
--- /dev/null
@@ -0,0 +1,266 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include "test/rbd_mirror/test_mock_fixture.h"
+#include "librbd/journal/Types.h"
+#include "librbd/journal/TypeTraits.h"
+#include "tools/rbd_mirror/Threads.h"
+#include "tools/rbd_mirror/image_replayer/journal/EventPreprocessor.h"
+#include "test/journal/mock/MockJournaler.h"
+#include "test/librbd/mock/MockImageCtx.h"
+
+namespace librbd {
+
+namespace {
+
+struct MockTestImageCtx : public librbd::MockImageCtx {
+  explicit MockTestImageCtx(librbd::ImageCtx &image_ctx)
+    : librbd::MockImageCtx(image_ctx) {
+  }
+};
+
+} // anonymous namespace
+
+namespace journal {
+
+template <>
+struct TypeTraits<librbd::MockTestImageCtx> {
+  typedef ::journal::MockJournaler Journaler;
+};
+
+} // namespace journal
+} // namespace librbd
+
+// template definitions
+#include "tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc"
+
+namespace rbd {
+namespace mirror {
+namespace image_replayer {
+namespace journal {
+
+using testing::_;
+using testing::WithArg;
+
+class TestMockImageReplayerJournalEventPreprocessor : public TestMockFixture {
+public:
+  typedef EventPreprocessor<librbd::MockTestImageCtx> MockEventPreprocessor;
+
+  void SetUp() override {
+    TestMockFixture::SetUp();
+
+    librbd::RBD rbd;
+    ASSERT_EQ(0, create_image(rbd, m_local_io_ctx, m_image_name, m_image_size));
+    ASSERT_EQ(0, open_image(m_local_io_ctx, m_image_name, &m_local_image_ctx));
+  }
+
+  void expect_image_refresh(librbd::MockTestImageCtx &mock_remote_image_ctx, int r) {
+    EXPECT_CALL(*mock_remote_image_ctx.state, refresh(_))
+      .WillOnce(CompleteContext(r));
+  }
+
+  void expect_update_client(::journal::MockJournaler &mock_journaler, int r) {
+    EXPECT_CALL(mock_journaler, update_client(_, _))
+      .WillOnce(WithArg<1>(CompleteContext(r)));
+  }
+
+  librbd::ImageCtx *m_local_image_ctx;
+  librbd::journal::MirrorPeerClientMeta m_client_meta;
+
+};
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, IsNotRequired) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{librbd::journal::RenameEvent{}};
+  ASSERT_FALSE(event_preprocessor.is_required(event_entry));
+}
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, IsRequiredSnapMapPrune) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  m_client_meta.snap_seqs = {{1, 2}, {3, 4}};
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{librbd::journal::RenameEvent{}};
+  ASSERT_TRUE(event_preprocessor.is_required(event_entry));
+}
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, IsRequiredSnapRename) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{librbd::journal::SnapRenameEvent{}};
+  ASSERT_TRUE(event_preprocessor.is_required(event_entry));
+}
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, PreprocessSnapMapPrune) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  expect_image_refresh(mock_local_image_ctx, 0);
+  expect_update_client(mock_remote_journaler, 0);
+
+  mock_local_image_ctx.snap_info = {
+    {6, librbd::SnapInfo{"snap", cls::rbd::UserSnapshotNamespace(), 0U, {}, 0U, 0U, utime_t()}}};
+  m_client_meta.snap_seqs = {{1, 2}, {3, 4}, {5, 6}};
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{librbd::journal::RenameEvent{}};
+  C_SaferCond ctx;
+  event_preprocessor.preprocess(&event_entry, &ctx);
+  ASSERT_EQ(0, ctx.wait());
+
+  librbd::SnapSeqs expected_snap_seqs = {{5, 6}};
+  ASSERT_EQ(expected_snap_seqs, m_client_meta.snap_seqs);
+}
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, PreprocessSnapRename) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  expect_image_refresh(mock_local_image_ctx, 0);
+  expect_update_client(mock_remote_journaler, 0);
+
+  mock_local_image_ctx.snap_ids = {{{cls::rbd::UserSnapshotNamespace(), "snap"}, 6}};
+  mock_local_image_ctx.snap_info = {
+    {6, librbd::SnapInfo{"snap", cls::rbd::UserSnapshotNamespace(), 0U, {}, 0U, 0U, utime_t()}}};
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{
+    librbd::journal::SnapRenameEvent{0, 5, "snap", "new_snap"}};
+  C_SaferCond ctx;
+  event_preprocessor.preprocess(&event_entry, &ctx);
+  ASSERT_EQ(0, ctx.wait());
+
+  librbd::SnapSeqs expected_snap_seqs = {{5, 6}};
+  ASSERT_EQ(expected_snap_seqs, m_client_meta.snap_seqs);
+
+  librbd::journal::SnapRenameEvent *event =
+    boost::get<librbd::journal::SnapRenameEvent>(&event_entry.event);
+  ASSERT_EQ(6U, event->snap_id);
+}
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, PreprocessSnapRenameMissing) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  expect_image_refresh(mock_local_image_ctx, 0);
+
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{
+    librbd::journal::SnapRenameEvent{0, 5, "snap", "new_snap"}};
+  C_SaferCond ctx;
+  event_preprocessor.preprocess(&event_entry, &ctx);
+  ASSERT_EQ(-ENOENT, ctx.wait());
+
+  librbd::journal::SnapRenameEvent *event =
+    boost::get<librbd::journal::SnapRenameEvent>(&event_entry.event);
+  ASSERT_EQ(CEPH_NOSNAP, event->snap_id);
+}
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, PreprocessSnapRenameKnown) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  expect_image_refresh(mock_local_image_ctx, 0);
+
+  mock_local_image_ctx.snap_info = {
+    {6, librbd::SnapInfo{"snap", cls::rbd::UserSnapshotNamespace(), 0U, {}, 0U, 0U, utime_t()}}};
+  m_client_meta.snap_seqs = {{5, 6}};
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{
+    librbd::journal::SnapRenameEvent{0, 5, "snap", "new_snap"}};
+  C_SaferCond ctx;
+  event_preprocessor.preprocess(&event_entry, &ctx);
+  ASSERT_EQ(0, ctx.wait());
+
+  librbd::SnapSeqs expected_snap_seqs = {{5, 6}};
+  ASSERT_EQ(expected_snap_seqs, m_client_meta.snap_seqs);
+
+  librbd::journal::SnapRenameEvent *event =
+    boost::get<librbd::journal::SnapRenameEvent>(&event_entry.event);
+  ASSERT_EQ(6U, event->snap_id);
+}
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, PreprocessRefreshError) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  expect_image_refresh(mock_local_image_ctx, -EINVAL);
+
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{librbd::journal::RenameEvent{}};
+  C_SaferCond ctx;
+  event_preprocessor.preprocess(&event_entry, &ctx);
+  ASSERT_EQ(-EINVAL, ctx.wait());
+}
+
+TEST_F(TestMockImageReplayerJournalEventPreprocessor, PreprocessClientUpdateError) {
+  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
+  ::journal::MockJournaler mock_remote_journaler;
+
+  expect_image_refresh(mock_local_image_ctx, 0);
+  expect_update_client(mock_remote_journaler, -EINVAL);
+
+  mock_local_image_ctx.snap_ids = {{{cls::rbd::UserSnapshotNamespace(), "snap"}, 6}};
+  mock_local_image_ctx.snap_info = {
+    {6, librbd::SnapInfo{"snap", cls::rbd::UserSnapshotNamespace(), 0U, {}, 0U, 0U, utime_t()}}};
+  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
+                                           mock_remote_journaler,
+                                           "local mirror uuid",
+                                           &m_client_meta,
+                                           m_threads->work_queue);
+
+  librbd::journal::EventEntry event_entry{
+    librbd::journal::SnapRenameEvent{0, 5, "snap", "new_snap"}};
+  C_SaferCond ctx;
+  event_preprocessor.preprocess(&event_entry, &ctx);
+  ASSERT_EQ(-EINVAL, ctx.wait());
+}
+
+} // namespace journal
+} // namespace image_replayer
+} // namespace mirror
+} // namespace rbd
diff --git a/src/test/rbd_mirror/image_replayer/test_mock_EventPreprocessor.cc b/src/test/rbd_mirror/image_replayer/test_mock_EventPreprocessor.cc
deleted file mode 100644 (file)
index 9e02a82..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#include "test/rbd_mirror/test_mock_fixture.h"
-#include "librbd/journal/Types.h"
-#include "librbd/journal/TypeTraits.h"
-#include "tools/rbd_mirror/image_replayer/EventPreprocessor.h"
-#include "tools/rbd_mirror/Threads.h"
-#include "test/journal/mock/MockJournaler.h"
-#include "test/librbd/mock/MockImageCtx.h"
-
-namespace librbd {
-
-namespace {
-
-struct MockTestImageCtx : public librbd::MockImageCtx {
-  explicit MockTestImageCtx(librbd::ImageCtx &image_ctx)
-    : librbd::MockImageCtx(image_ctx) {
-  }
-};
-
-} // anonymous namespace
-
-namespace journal {
-
-template <>
-struct TypeTraits<librbd::MockTestImageCtx> {
-  typedef ::journal::MockJournaler Journaler;
-};
-
-} // namespace journal
-} // namespace librbd
-
-// template definitions
-#include "tools/rbd_mirror/image_replayer/EventPreprocessor.cc"
-template class rbd::mirror::image_replayer::EventPreprocessor<librbd::MockTestImageCtx>;
-
-namespace rbd {
-namespace mirror {
-namespace image_replayer {
-
-using testing::_;
-using testing::WithArg;
-
-class TestMockImageReplayerEventPreprocessor : public TestMockFixture {
-public:
-  typedef EventPreprocessor<librbd::MockTestImageCtx> MockEventPreprocessor;
-
-  void SetUp() override {
-    TestMockFixture::SetUp();
-
-    librbd::RBD rbd;
-    ASSERT_EQ(0, create_image(rbd, m_local_io_ctx, m_image_name, m_image_size));
-    ASSERT_EQ(0, open_image(m_local_io_ctx, m_image_name, &m_local_image_ctx));
-  }
-
-  void expect_image_refresh(librbd::MockTestImageCtx &mock_remote_image_ctx, int r) {
-    EXPECT_CALL(*mock_remote_image_ctx.state, refresh(_))
-      .WillOnce(CompleteContext(r));
-  }
-
-  void expect_update_client(journal::MockJournaler &mock_journaler, int r) {
-    EXPECT_CALL(mock_journaler, update_client(_, _))
-      .WillOnce(WithArg<1>(CompleteContext(r)));
-  }
-
-  librbd::ImageCtx *m_local_image_ctx;
-  librbd::journal::MirrorPeerClientMeta m_client_meta;
-
-};
-
-TEST_F(TestMockImageReplayerEventPreprocessor, IsNotRequired) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{librbd::journal::RenameEvent{}};
-  ASSERT_FALSE(event_preprocessor.is_required(event_entry));
-}
-
-TEST_F(TestMockImageReplayerEventPreprocessor, IsRequiredSnapMapPrune) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  m_client_meta.snap_seqs = {{1, 2}, {3, 4}};
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{librbd::journal::RenameEvent{}};
-  ASSERT_TRUE(event_preprocessor.is_required(event_entry));
-}
-
-TEST_F(TestMockImageReplayerEventPreprocessor, IsRequiredSnapRename) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{librbd::journal::SnapRenameEvent{}};
-  ASSERT_TRUE(event_preprocessor.is_required(event_entry));
-}
-
-TEST_F(TestMockImageReplayerEventPreprocessor, PreprocessSnapMapPrune) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  expect_image_refresh(mock_local_image_ctx, 0);
-  expect_update_client(mock_remote_journaler, 0);
-
-  mock_local_image_ctx.snap_info = {
-    {6, librbd::SnapInfo{"snap", cls::rbd::UserSnapshotNamespace(), 0U, {}, 0U, 0U, utime_t()}}};
-  m_client_meta.snap_seqs = {{1, 2}, {3, 4}, {5, 6}};
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{librbd::journal::RenameEvent{}};
-  C_SaferCond ctx;
-  event_preprocessor.preprocess(&event_entry, &ctx);
-  ASSERT_EQ(0, ctx.wait());
-
-  librbd::SnapSeqs expected_snap_seqs = {{5, 6}};
-  ASSERT_EQ(expected_snap_seqs, m_client_meta.snap_seqs);
-}
-
-TEST_F(TestMockImageReplayerEventPreprocessor, PreprocessSnapRename) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  expect_image_refresh(mock_local_image_ctx, 0);
-  expect_update_client(mock_remote_journaler, 0);
-
-  mock_local_image_ctx.snap_ids = {{{cls::rbd::UserSnapshotNamespace(), "snap"}, 6}};
-  mock_local_image_ctx.snap_info = {
-    {6, librbd::SnapInfo{"snap", cls::rbd::UserSnapshotNamespace(), 0U, {}, 0U, 0U, utime_t()}}};
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{
-    librbd::journal::SnapRenameEvent{0, 5, "snap", "new_snap"}};
-  C_SaferCond ctx;
-  event_preprocessor.preprocess(&event_entry, &ctx);
-  ASSERT_EQ(0, ctx.wait());
-
-  librbd::SnapSeqs expected_snap_seqs = {{5, 6}};
-  ASSERT_EQ(expected_snap_seqs, m_client_meta.snap_seqs);
-
-  librbd::journal::SnapRenameEvent *event =
-    boost::get<librbd::journal::SnapRenameEvent>(&event_entry.event);
-  ASSERT_EQ(6U, event->snap_id);
-}
-
-TEST_F(TestMockImageReplayerEventPreprocessor, PreprocessSnapRenameMissing) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  expect_image_refresh(mock_local_image_ctx, 0);
-
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{
-    librbd::journal::SnapRenameEvent{0, 5, "snap", "new_snap"}};
-  C_SaferCond ctx;
-  event_preprocessor.preprocess(&event_entry, &ctx);
-  ASSERT_EQ(-ENOENT, ctx.wait());
-
-  librbd::journal::SnapRenameEvent *event =
-    boost::get<librbd::journal::SnapRenameEvent>(&event_entry.event);
-  ASSERT_EQ(CEPH_NOSNAP, event->snap_id);
-}
-
-TEST_F(TestMockImageReplayerEventPreprocessor, PreprocessSnapRenameKnown) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  expect_image_refresh(mock_local_image_ctx, 0);
-
-  mock_local_image_ctx.snap_info = {
-    {6, librbd::SnapInfo{"snap", cls::rbd::UserSnapshotNamespace(), 0U, {}, 0U, 0U, utime_t()}}};
-  m_client_meta.snap_seqs = {{5, 6}};
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{
-    librbd::journal::SnapRenameEvent{0, 5, "snap", "new_snap"}};
-  C_SaferCond ctx;
-  event_preprocessor.preprocess(&event_entry, &ctx);
-  ASSERT_EQ(0, ctx.wait());
-
-  librbd::SnapSeqs expected_snap_seqs = {{5, 6}};
-  ASSERT_EQ(expected_snap_seqs, m_client_meta.snap_seqs);
-
-  librbd::journal::SnapRenameEvent *event =
-    boost::get<librbd::journal::SnapRenameEvent>(&event_entry.event);
-  ASSERT_EQ(6U, event->snap_id);
-}
-
-TEST_F(TestMockImageReplayerEventPreprocessor, PreprocessRefreshError) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  expect_image_refresh(mock_local_image_ctx, -EINVAL);
-
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{librbd::journal::RenameEvent{}};
-  C_SaferCond ctx;
-  event_preprocessor.preprocess(&event_entry, &ctx);
-  ASSERT_EQ(-EINVAL, ctx.wait());
-}
-
-TEST_F(TestMockImageReplayerEventPreprocessor, PreprocessClientUpdateError) {
-  librbd::MockTestImageCtx mock_local_image_ctx(*m_local_image_ctx);
-  ::journal::MockJournaler mock_remote_journaler;
-
-  expect_image_refresh(mock_local_image_ctx, 0);
-  expect_update_client(mock_remote_journaler, -EINVAL);
-
-  mock_local_image_ctx.snap_ids = {{{cls::rbd::UserSnapshotNamespace(), "snap"}, 6}};
-  mock_local_image_ctx.snap_info = {
-    {6, librbd::SnapInfo{"snap", cls::rbd::UserSnapshotNamespace(), 0U, {}, 0U, 0U, utime_t()}}};
-  MockEventPreprocessor event_preprocessor(mock_local_image_ctx,
-                                           mock_remote_journaler,
-                                           "local mirror uuid",
-                                           &m_client_meta,
-                                           m_threads->work_queue);
-
-  librbd::journal::EventEntry event_entry{
-    librbd::journal::SnapRenameEvent{0, 5, "snap", "new_snap"}};
-  C_SaferCond ctx;
-  event_preprocessor.preprocess(&event_entry, &ctx);
-  ASSERT_EQ(-EINVAL, ctx.wait());
-}
-
-} // namespace image_replayer
-} // namespace mirror
-} // namespace rbd
index a47b4456e6f65ba3815d65cf1a2f29885623750e..3b4d596ed55b08f6350a1e33528b3f84e4f45eee 100644 (file)
@@ -11,9 +11,9 @@
 #include "tools/rbd_mirror/Threads.h"
 #include "tools/rbd_mirror/image_replayer/BootstrapRequest.h"
 #include "tools/rbd_mirror/image_replayer/CloseImageRequest.h"
-#include "tools/rbd_mirror/image_replayer/EventPreprocessor.h"
 #include "tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.h"
 #include "tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h"
+#include "tools/rbd_mirror/image_replayer/journal/EventPreprocessor.h"
 #include "tools/rbd_mirror/image_replayer/journal/ReplayStatusFormatter.h"
 #include "test/rbd_mirror/test_mock_fixture.h"
 #include "test/journal/mock/MockJournaler.h"
@@ -270,6 +270,13 @@ struct CloseImageRequest<librbd::MockTestImageCtx> {
   MOCK_METHOD0(send, void());
 };
 
+BootstrapRequest<librbd::MockTestImageCtx>* BootstrapRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
+CloseImageRequest<librbd::MockTestImageCtx>* CloseImageRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
+PrepareLocalImageRequest<librbd::MockTestImageCtx>* PrepareLocalImageRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
+PrepareRemoteImageRequest<librbd::MockTestImageCtx>* PrepareRemoteImageRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
+
+namespace journal {
+
 template<>
 struct EventPreprocessor<librbd::MockTestImageCtx> {
   static EventPreprocessor *s_instance;
@@ -300,14 +307,6 @@ struct EventPreprocessor<librbd::MockTestImageCtx> {
   MOCK_METHOD2(preprocess, void(librbd::journal::EventEntry *, Context *));
 };
 
-BootstrapRequest<librbd::MockTestImageCtx>* BootstrapRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
-CloseImageRequest<librbd::MockTestImageCtx>* CloseImageRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
-EventPreprocessor<librbd::MockTestImageCtx>* EventPreprocessor<librbd::MockTestImageCtx>::s_instance = nullptr;
-PrepareLocalImageRequest<librbd::MockTestImageCtx>* PrepareLocalImageRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
-PrepareRemoteImageRequest<librbd::MockTestImageCtx>* PrepareRemoteImageRequest<librbd::MockTestImageCtx>::s_instance = nullptr;
-
-namespace journal {
-
 template<>
 struct ReplayStatusFormatter<librbd::MockTestImageCtx> {
   static ReplayStatusFormatter* s_instance;
@@ -334,6 +333,7 @@ struct ReplayStatusFormatter<librbd::MockTestImageCtx> {
   MOCK_METHOD2(get_or_send_update, bool(std::string *description, Context *on_finish));
 };
 
+EventPreprocessor<librbd::MockTestImageCtx>* EventPreprocessor<librbd::MockTestImageCtx>::s_instance = nullptr;
 ReplayStatusFormatter<librbd::MockTestImageCtx>* ReplayStatusFormatter<librbd::MockTestImageCtx>::s_instance = nullptr;
 
 } // namespace journal
@@ -365,9 +365,9 @@ public:
   typedef MirrorStatusUpdater<librbd::MockTestImageCtx> MockMirrorStatusUpdater;
   typedef image_replayer::BootstrapRequest<librbd::MockTestImageCtx> MockBootstrapRequest;
   typedef image_replayer::CloseImageRequest<librbd::MockTestImageCtx> MockCloseImageRequest;
-  typedef image_replayer::EventPreprocessor<librbd::MockTestImageCtx> MockEventPreprocessor;
   typedef image_replayer::PrepareLocalImageRequest<librbd::MockTestImageCtx> MockPrepareLocalImageRequest;
   typedef image_replayer::PrepareRemoteImageRequest<librbd::MockTestImageCtx> MockPrepareRemoteImageRequest;
+  typedef image_replayer::journal::EventPreprocessor<librbd::MockTestImageCtx> MockEventPreprocessor;
   typedef image_replayer::journal::ReplayStatusFormatter<librbd::MockTestImageCtx> MockReplayStatusFormatter;
   typedef librbd::journal::Replay<librbd::MockTestImageCtx> MockReplay;
   typedef ImageReplayer<librbd::MockTestImageCtx> MockImageReplayer;
index 736dbe9246cb1b5aecbb9c9c026710051ff8001b..cdac9c614c42b029176b5c10aad703c9fcea72f1 100644 (file)
@@ -35,13 +35,13 @@ set(rbd_mirror_internal
   image_replayer/BootstrapRequest.cc
   image_replayer/CloseImageRequest.cc
   image_replayer/CreateImageRequest.cc
-  image_replayer/EventPreprocessor.cc
   image_replayer/GetMirrorImageIdRequest.cc
   image_replayer/OpenImageRequest.cc
   image_replayer/OpenLocalImageRequest.cc
   image_replayer/PrepareLocalImageRequest.cc
   image_replayer/PrepareRemoteImageRequest.cc
   image_replayer/Utils.cc
+  image_replayer/journal/EventPreprocessor.cc
   image_replayer/journal/ReplayStatusFormatter.cc
   image_sync/SyncPointCreateRequest.cc
   image_sync/SyncPointPruneRequest.cc
index 9933dd7509b17423842f59c7972c8474d6ad5d41..42ef95606184df62dd453b414153334f40e3466e 100644 (file)
@@ -27,9 +27,9 @@
 #include "Threads.h"
 #include "tools/rbd_mirror/image_replayer/BootstrapRequest.h"
 #include "tools/rbd_mirror/image_replayer/CloseImageRequest.h"
-#include "tools/rbd_mirror/image_replayer/EventPreprocessor.h"
 #include "tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.h"
 #include "tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h"
+#include "tools/rbd_mirror/image_replayer/journal/EventPreprocessor.h"
 #include "tools/rbd_mirror/image_replayer/journal/ReplayStatusFormatter.h"
 
 #define dout_context g_ceph_context
@@ -633,7 +633,7 @@ void ImageReplayer<I>::handle_start_replay(int r) {
     std::swap(m_on_start_finish, on_finish);
   }
 
-  m_event_preprocessor = image_replayer::EventPreprocessor<I>::create(
+  m_event_preprocessor = image_replayer::journal::EventPreprocessor<I>::create(
     *m_local_image_ctx, *m_remote_journaler, m_local_mirror_uuid,
     &m_client_meta, m_threads->work_queue);
 
@@ -1543,7 +1543,8 @@ void ImageReplayer<I>::shut_down(int r) {
           m_local_journal->stop_external_replay();
           m_local_replay = nullptr;
 
-          image_replayer::EventPreprocessor<I>::destroy(m_event_preprocessor);
+          image_replayer::journal::EventPreprocessor<I>::destroy(
+            m_event_preprocessor);
           m_event_preprocessor = nullptr;
           ctx->complete(0);
         });
index 29613c87cac6dd540639e2b1596a608bba1b1692..f121f02e53efc7bf42f00d55ab611e28e37aae2d 100644 (file)
@@ -56,10 +56,13 @@ template <typename> struct Threads;
 namespace image_replayer {
 
 template <typename> class BootstrapRequest;
-template <typename> class EventPreprocessor;
 
-namespace journal { template <typename> class ReplayStatusFormatter; }
+namespace journal {
 
+template <typename> class EventPreprocessor;
+template <typename> class ReplayStatusFormatter;
+
+} // namespace journal
 } // namespace image_replayer
 
 /**
@@ -311,7 +314,8 @@ private:
   bool m_delete_requested = false;
   bool m_resync_requested = false;
 
-  image_replayer::EventPreprocessor<ImageCtxT> *m_event_preprocessor = nullptr;
+  image_replayer::journal::EventPreprocessor<ImageCtxT>*
+      m_event_preprocessor = nullptr;
   image_replayer::journal::ReplayStatusFormatter<ImageCtxT>*
     m_replay_status_formatter = nullptr;
   ImageCtxT *m_local_image_ctx = nullptr;
diff --git a/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc b/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc
deleted file mode 100644 (file)
index 9034ca4..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#include "EventPreprocessor.h"
-#include "common/debug.h"
-#include "common/dout.h"
-#include "common/errno.h"
-#include "common/WorkQueue.h"
-#include "journal/Journaler.h"
-#include "librbd/ImageCtx.h"
-#include "librbd/ImageState.h"
-#include "librbd/Utils.h"
-#include "librbd/journal/Types.h"
-#include <boost/variant.hpp>
-
-#define dout_context g_ceph_context
-#define dout_subsys ceph_subsys_rbd_mirror
-
-#undef dout_prefix
-#define dout_prefix *_dout << "rbd::mirror::image_replayer::EventPreprocessor: " \
-                           << this << " " << __func__
-
-namespace rbd {
-namespace mirror {
-namespace image_replayer {
-
-using librbd::util::create_context_callback;
-
-template <typename I>
-EventPreprocessor<I>::EventPreprocessor(I &local_image_ctx,
-                                        Journaler &remote_journaler,
-                                        const std::string &local_mirror_uuid,
-                                        MirrorPeerClientMeta *client_meta,
-                                        ContextWQ *work_queue)
-  : m_local_image_ctx(local_image_ctx), m_remote_journaler(remote_journaler),
-    m_local_mirror_uuid(local_mirror_uuid), m_client_meta(client_meta),
-    m_work_queue(work_queue) {
-}
-
-template <typename I>
-EventPreprocessor<I>::~EventPreprocessor() {
-  ceph_assert(!m_in_progress);
-}
-
-template <typename I>
-bool EventPreprocessor<I>::is_required(const EventEntry &event_entry) {
-  SnapSeqs snap_seqs(m_client_meta->snap_seqs);
-  return (prune_snap_map(&snap_seqs) ||
-          event_entry.get_event_type() ==
-            librbd::journal::EVENT_TYPE_SNAP_RENAME);
-}
-
-template <typename I>
-void EventPreprocessor<I>::preprocess(EventEntry *event_entry,
-                                      Context *on_finish) {
-  ceph_assert(!m_in_progress);
-  m_in_progress = true;
-  m_event_entry = event_entry;
-  m_on_finish = on_finish;
-
-  refresh_image();
-}
-
-template <typename I>
-void EventPreprocessor<I>::refresh_image() {
-  dout(20) << dendl;
-
-  Context *ctx = create_context_callback<
-    EventPreprocessor<I>, &EventPreprocessor<I>::handle_refresh_image>(this);
-  m_local_image_ctx.state->refresh(ctx);
-}
-
-template <typename I>
-void EventPreprocessor<I>::handle_refresh_image(int r) {
-  dout(20) << ": r=" << r << dendl;
-
-  if (r < 0) {
-    derr << "error encountered during image refresh: " << cpp_strerror(r)
-         << dendl;
-    finish(r);
-    return;
-  }
-
-  preprocess_event();
-}
-
-template <typename I>
-void EventPreprocessor<I>::preprocess_event() {
-  dout(20) << dendl;
-
-  m_snap_seqs = m_client_meta->snap_seqs;
-  m_snap_seqs_updated = prune_snap_map(&m_snap_seqs);
-
-  int r = boost::apply_visitor(PreprocessEventVisitor(this),
-                               m_event_entry->event);
-  if (r < 0) {
-    finish(r);
-    return;
-  }
-
-  update_client();
-}
-
-template <typename I>
-int EventPreprocessor<I>::preprocess_snap_rename(
-    librbd::journal::SnapRenameEvent &event) {
-  dout(20) << ": "
-           << "remote_snap_id=" << event.snap_id << ", "
-           << "src_snap_name=" << event.src_snap_name << ", "
-           << "dest_snap_name=" << event.dst_snap_name << dendl;
-
-  auto snap_seq_it = m_snap_seqs.find(event.snap_id);
-  if (snap_seq_it != m_snap_seqs.end()) {
-    dout(20) << ": remapping remote snap id " << snap_seq_it->first << " "
-             << "to local snap id " << snap_seq_it->second << dendl;
-    event.snap_id = snap_seq_it->second;
-    return 0;
-  }
-
-  auto snap_id_it = m_local_image_ctx.snap_ids.find({cls::rbd::UserSnapshotNamespace(),
-                                                    event.src_snap_name});
-  if (snap_id_it == m_local_image_ctx.snap_ids.end()) {
-    dout(20) << ": cannot map remote snapshot '" << event.src_snap_name << "' "
-             << "to local snapshot" << dendl;
-    event.snap_id = CEPH_NOSNAP;
-    return -ENOENT;
-  }
-
-  dout(20) << ": mapping remote snap id " << event.snap_id << " "
-           << "to local snap id " << snap_id_it->second << dendl;
-  m_snap_seqs_updated = true;
-  m_snap_seqs[event.snap_id] = snap_id_it->second;
-  event.snap_id = snap_id_it->second;
-  return 0;
-}
-
-template <typename I>
-void EventPreprocessor<I>::update_client() {
-  if (!m_snap_seqs_updated) {
-    finish(0);
-    return;
-  }
-
-  dout(20) << dendl;
-  librbd::journal::MirrorPeerClientMeta client_meta(*m_client_meta);
-  client_meta.snap_seqs = m_snap_seqs;
-
-  librbd::journal::ClientData client_data(client_meta);
-  bufferlist data_bl;
-  encode(client_data, data_bl);
-
-  Context *ctx = create_context_callback<
-    EventPreprocessor<I>, &EventPreprocessor<I>::handle_update_client>(
-      this);
-  m_remote_journaler.update_client(data_bl, ctx);
-}
-
-template <typename I>
-void EventPreprocessor<I>::handle_update_client(int r) {
-  dout(20) << ": r=" << r << dendl;
-
-  if (r < 0) {
-    derr << "failed to update mirror peer journal client: "
-         << cpp_strerror(r) << dendl;
-    finish(r);
-    return;
-  }
-
-  m_client_meta->snap_seqs = m_snap_seqs;
-  finish(0);
-}
-
-template <typename I>
-bool EventPreprocessor<I>::prune_snap_map(SnapSeqs *snap_seqs) {
-  bool pruned = false;
-
-  std::shared_lock image_locker{m_local_image_ctx.image_lock};
-  for (auto it = snap_seqs->begin(); it != snap_seqs->end(); ) {
-    auto current_it(it++);
-    if (m_local_image_ctx.snap_info.count(current_it->second) == 0) {
-      snap_seqs->erase(current_it);
-      pruned = true;
-    }
-  }
-  return pruned;
-}
-
-template <typename I>
-void EventPreprocessor<I>::finish(int r) {
-  dout(20) << ": r=" << r << dendl;
-
-  Context *on_finish = m_on_finish;
-  m_on_finish = nullptr;
-  m_event_entry = nullptr;
-  m_in_progress = false;
-  m_snap_seqs_updated = false;
-  m_work_queue->queue(on_finish, r);
-}
-
-} // namespace image_replayer
-} // namespace mirror
-} // namespace rbd
-
-template class rbd::mirror::image_replayer::EventPreprocessor<librbd::ImageCtx>;
diff --git a/src/tools/rbd_mirror/image_replayer/EventPreprocessor.h b/src/tools/rbd_mirror/image_replayer/EventPreprocessor.h
deleted file mode 100644 (file)
index 67aeea0..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#ifndef RBD_MIRROR_IMAGE_REPLAYER_EVENT_PREPROCESSOR_H
-#define RBD_MIRROR_IMAGE_REPLAYER_EVENT_PREPROCESSOR_H
-
-#include "include/int_types.h"
-#include "librbd/journal/Types.h"
-#include "librbd/journal/TypeTraits.h"
-#include <map>
-#include <string>
-#include <boost/variant/static_visitor.hpp>
-
-struct Context;
-struct ContextWQ;
-namespace journal { class Journaler; }
-namespace librbd { class ImageCtx; }
-
-namespace rbd {
-namespace mirror {
-namespace image_replayer {
-
-template <typename ImageCtxT = librbd::ImageCtx>
-class EventPreprocessor {
-public:
-  using Journaler = typename librbd::journal::TypeTraits<ImageCtxT>::Journaler;
-  using EventEntry = librbd::journal::EventEntry;
-  using MirrorPeerClientMeta = librbd::journal::MirrorPeerClientMeta;
-
-  static EventPreprocessor *create(ImageCtxT &local_image_ctx,
-                                   Journaler &remote_journaler,
-                                   const std::string &local_mirror_uuid,
-                                   MirrorPeerClientMeta *client_meta,
-                                   ContextWQ *work_queue) {
-    return new EventPreprocessor(local_image_ctx, remote_journaler,
-                                 local_mirror_uuid, client_meta, work_queue);
-  }
-
-  static void destroy(EventPreprocessor* processor) {
-    delete processor;
-  }
-
-  EventPreprocessor(ImageCtxT &local_image_ctx, Journaler &remote_journaler,
-                    const std::string &local_mirror_uuid,
-                    MirrorPeerClientMeta *client_meta, ContextWQ *work_queue);
-  ~EventPreprocessor();
-
-  bool is_required(const EventEntry &event_entry);
-  void preprocess(EventEntry *event_entry, Context *on_finish);
-
-private:
-  /**
-   * @verbatim
-   *
-   * <start>
-   *    |
-   *    v (skip if not required)
-   * REFRESH_IMAGE
-   *    |
-   *    v (skip if not required)
-   * PREPROCESS_EVENT
-   *    |
-   *    v (skip if not required)
-   * UPDATE_CLIENT
-   *
-   * @endverbatim
-   */
-
-  typedef std::map<uint64_t, uint64_t> SnapSeqs;
-
-  class PreprocessEventVisitor : public boost::static_visitor<int> {
-  public:
-    EventPreprocessor *event_preprocessor;
-
-    PreprocessEventVisitor(EventPreprocessor *event_preprocessor)
-      : event_preprocessor(event_preprocessor) {
-    }
-
-    template <typename T>
-    inline int operator()(T&) const {
-      return 0;
-    }
-    inline int operator()(librbd::journal::SnapRenameEvent &event) const {
-      return event_preprocessor->preprocess_snap_rename(event);
-    }
-  };
-
-  ImageCtxT &m_local_image_ctx;
-  Journaler &m_remote_journaler;
-  std::string m_local_mirror_uuid;
-  MirrorPeerClientMeta *m_client_meta;
-  ContextWQ *m_work_queue;
-
-  bool m_in_progress = false;
-  EventEntry *m_event_entry = nullptr;
-  Context *m_on_finish = nullptr;
-
-  SnapSeqs m_snap_seqs;
-  bool m_snap_seqs_updated = false;
-
-  bool prune_snap_map(SnapSeqs *snap_seqs);
-
-  void refresh_image();
-  void handle_refresh_image(int r);
-
-  void preprocess_event();
-  int preprocess_snap_rename(librbd::journal::SnapRenameEvent &event);
-
-  void update_client();
-  void handle_update_client(int r);
-
-  void finish(int r);
-
-};
-
-} // namespace image_replayer
-} // namespace mirror
-} // namespace rbd
-
-extern template class rbd::mirror::image_replayer::EventPreprocessor<librbd::ImageCtx>;
-
-#endif // RBD_MIRROR_IMAGE_REPLAYER_EVENT_PREPROCESSOR_H
diff --git a/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc b/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.cc
new file mode 100644 (file)
index 0000000..c156807
--- /dev/null
@@ -0,0 +1,206 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include "EventPreprocessor.h"
+#include "common/debug.h"
+#include "common/dout.h"
+#include "common/errno.h"
+#include "common/WorkQueue.h"
+#include "journal/Journaler.h"
+#include "librbd/ImageCtx.h"
+#include "librbd/ImageState.h"
+#include "librbd/Utils.h"
+#include "librbd/journal/Types.h"
+#include <boost/variant.hpp>
+
+#define dout_context g_ceph_context
+#define dout_subsys ceph_subsys_rbd_mirror
+
+#undef dout_prefix
+#define dout_prefix *_dout << "rbd::mirror::image_replayer::journal::" \
+                           << "EventPreprocessor: " << this << " " << __func__ \
+                           << ": "
+
+namespace rbd {
+namespace mirror {
+namespace image_replayer {
+namespace journal {
+
+using librbd::util::create_context_callback;
+
+template <typename I>
+EventPreprocessor<I>::EventPreprocessor(I &local_image_ctx,
+                                        Journaler &remote_journaler,
+                                        const std::string &local_mirror_uuid,
+                                        MirrorPeerClientMeta *client_meta,
+                                        ContextWQ *work_queue)
+  : m_local_image_ctx(local_image_ctx), m_remote_journaler(remote_journaler),
+    m_local_mirror_uuid(local_mirror_uuid), m_client_meta(client_meta),
+    m_work_queue(work_queue) {
+}
+
+template <typename I>
+EventPreprocessor<I>::~EventPreprocessor() {
+  ceph_assert(!m_in_progress);
+}
+
+template <typename I>
+bool EventPreprocessor<I>::is_required(const EventEntry &event_entry) {
+  SnapSeqs snap_seqs(m_client_meta->snap_seqs);
+  return (prune_snap_map(&snap_seqs) ||
+          event_entry.get_event_type() ==
+            librbd::journal::EVENT_TYPE_SNAP_RENAME);
+}
+
+template <typename I>
+void EventPreprocessor<I>::preprocess(EventEntry *event_entry,
+                                      Context *on_finish) {
+  ceph_assert(!m_in_progress);
+  m_in_progress = true;
+  m_event_entry = event_entry;
+  m_on_finish = on_finish;
+
+  refresh_image();
+}
+
+template <typename I>
+void EventPreprocessor<I>::refresh_image() {
+  dout(20) << dendl;
+
+  Context *ctx = create_context_callback<
+    EventPreprocessor<I>, &EventPreprocessor<I>::handle_refresh_image>(this);
+  m_local_image_ctx.state->refresh(ctx);
+}
+
+template <typename I>
+void EventPreprocessor<I>::handle_refresh_image(int r) {
+  dout(20) << "r=" << r << dendl;
+
+  if (r < 0) {
+    derr << "error encountered during image refresh: " << cpp_strerror(r)
+         << dendl;
+    finish(r);
+    return;
+  }
+
+  preprocess_event();
+}
+
+template <typename I>
+void EventPreprocessor<I>::preprocess_event() {
+  dout(20) << dendl;
+
+  m_snap_seqs = m_client_meta->snap_seqs;
+  m_snap_seqs_updated = prune_snap_map(&m_snap_seqs);
+
+  int r = boost::apply_visitor(PreprocessEventVisitor(this),
+                               m_event_entry->event);
+  if (r < 0) {
+    finish(r);
+    return;
+  }
+
+  update_client();
+}
+
+template <typename I>
+int EventPreprocessor<I>::preprocess_snap_rename(
+    librbd::journal::SnapRenameEvent &event) {
+  dout(20) << "remote_snap_id=" << event.snap_id << ", "
+           << "src_snap_name=" << event.src_snap_name << ", "
+           << "dest_snap_name=" << event.dst_snap_name << dendl;
+
+  auto snap_seq_it = m_snap_seqs.find(event.snap_id);
+  if (snap_seq_it != m_snap_seqs.end()) {
+    dout(20) << "remapping remote snap id " << snap_seq_it->first << " "
+             << "to local snap id " << snap_seq_it->second << dendl;
+    event.snap_id = snap_seq_it->second;
+    return 0;
+  }
+
+  auto snap_id_it = m_local_image_ctx.snap_ids.find({cls::rbd::UserSnapshotNamespace(),
+                                                    event.src_snap_name});
+  if (snap_id_it == m_local_image_ctx.snap_ids.end()) {
+    dout(20) << "cannot map remote snapshot '" << event.src_snap_name << "' "
+             << "to local snapshot" << dendl;
+    event.snap_id = CEPH_NOSNAP;
+    return -ENOENT;
+  }
+
+  dout(20) << "mapping remote snap id " << event.snap_id << " "
+           << "to local snap id " << snap_id_it->second << dendl;
+  m_snap_seqs_updated = true;
+  m_snap_seqs[event.snap_id] = snap_id_it->second;
+  event.snap_id = snap_id_it->second;
+  return 0;
+}
+
+template <typename I>
+void EventPreprocessor<I>::update_client() {
+  if (!m_snap_seqs_updated) {
+    finish(0);
+    return;
+  }
+
+  dout(20) << dendl;
+  librbd::journal::MirrorPeerClientMeta client_meta(*m_client_meta);
+  client_meta.snap_seqs = m_snap_seqs;
+
+  librbd::journal::ClientData client_data(client_meta);
+  bufferlist data_bl;
+  encode(client_data, data_bl);
+
+  Context *ctx = create_context_callback<
+    EventPreprocessor<I>, &EventPreprocessor<I>::handle_update_client>(
+      this);
+  m_remote_journaler.update_client(data_bl, ctx);
+}
+
+template <typename I>
+void EventPreprocessor<I>::handle_update_client(int r) {
+  dout(20) << "r=" << r << dendl;
+
+  if (r < 0) {
+    derr << "failed to update mirror peer journal client: "
+         << cpp_strerror(r) << dendl;
+    finish(r);
+    return;
+  }
+
+  m_client_meta->snap_seqs = m_snap_seqs;
+  finish(0);
+}
+
+template <typename I>
+bool EventPreprocessor<I>::prune_snap_map(SnapSeqs *snap_seqs) {
+  bool pruned = false;
+
+  std::shared_lock image_locker{m_local_image_ctx.image_lock};
+  for (auto it = snap_seqs->begin(); it != snap_seqs->end(); ) {
+    auto current_it(it++);
+    if (m_local_image_ctx.snap_info.count(current_it->second) == 0) {
+      snap_seqs->erase(current_it);
+      pruned = true;
+    }
+  }
+  return pruned;
+}
+
+template <typename I>
+void EventPreprocessor<I>::finish(int r) {
+  dout(20) << "r=" << r << dendl;
+
+  Context *on_finish = m_on_finish;
+  m_on_finish = nullptr;
+  m_event_entry = nullptr;
+  m_in_progress = false;
+  m_snap_seqs_updated = false;
+  m_work_queue->queue(on_finish, r);
+}
+
+} // namespace journal
+} // namespace image_replayer
+} // namespace mirror
+} // namespace rbd
+
+template class rbd::mirror::image_replayer::journal::EventPreprocessor<librbd::ImageCtx>;
diff --git a/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.h b/src/tools/rbd_mirror/image_replayer/journal/EventPreprocessor.h
new file mode 100644 (file)
index 0000000..5844e6f
--- /dev/null
@@ -0,0 +1,124 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#ifndef RBD_MIRROR_IMAGE_REPLAYER_EVENT_PREPROCESSOR_H
+#define RBD_MIRROR_IMAGE_REPLAYER_EVENT_PREPROCESSOR_H
+
+#include "include/int_types.h"
+#include "librbd/journal/Types.h"
+#include "librbd/journal/TypeTraits.h"
+#include <map>
+#include <string>
+#include <boost/variant/static_visitor.hpp>
+
+struct Context;
+struct ContextWQ;
+namespace journal { class Journaler; }
+namespace librbd { class ImageCtx; }
+
+namespace rbd {
+namespace mirror {
+namespace image_replayer {
+namespace journal {
+
+template <typename ImageCtxT = librbd::ImageCtx>
+class EventPreprocessor {
+public:
+  using Journaler = typename librbd::journal::TypeTraits<ImageCtxT>::Journaler;
+  using EventEntry = librbd::journal::EventEntry;
+  using MirrorPeerClientMeta = librbd::journal::MirrorPeerClientMeta;
+
+  static EventPreprocessor *create(ImageCtxT &local_image_ctx,
+                                   Journaler &remote_journaler,
+                                   const std::string &local_mirror_uuid,
+                                   MirrorPeerClientMeta *client_meta,
+                                   ContextWQ *work_queue) {
+    return new EventPreprocessor(local_image_ctx, remote_journaler,
+                                 local_mirror_uuid, client_meta, work_queue);
+  }
+
+  static void destroy(EventPreprocessor* processor) {
+    delete processor;
+  }
+
+  EventPreprocessor(ImageCtxT &local_image_ctx, Journaler &remote_journaler,
+                    const std::string &local_mirror_uuid,
+                    MirrorPeerClientMeta *client_meta, ContextWQ *work_queue);
+  ~EventPreprocessor();
+
+  bool is_required(const EventEntry &event_entry);
+  void preprocess(EventEntry *event_entry, Context *on_finish);
+
+private:
+  /**
+   * @verbatim
+   *
+   * <start>
+   *    |
+   *    v (skip if not required)
+   * REFRESH_IMAGE
+   *    |
+   *    v (skip if not required)
+   * PREPROCESS_EVENT
+   *    |
+   *    v (skip if not required)
+   * UPDATE_CLIENT
+   *
+   * @endverbatim
+   */
+
+  typedef std::map<uint64_t, uint64_t> SnapSeqs;
+
+  class PreprocessEventVisitor : public boost::static_visitor<int> {
+  public:
+    EventPreprocessor *event_preprocessor;
+
+    PreprocessEventVisitor(EventPreprocessor *event_preprocessor)
+      : event_preprocessor(event_preprocessor) {
+    }
+
+    template <typename T>
+    inline int operator()(T&) const {
+      return 0;
+    }
+    inline int operator()(librbd::journal::SnapRenameEvent &event) const {
+      return event_preprocessor->preprocess_snap_rename(event);
+    }
+  };
+
+  ImageCtxT &m_local_image_ctx;
+  Journaler &m_remote_journaler;
+  std::string m_local_mirror_uuid;
+  MirrorPeerClientMeta *m_client_meta;
+  ContextWQ *m_work_queue;
+
+  bool m_in_progress = false;
+  EventEntry *m_event_entry = nullptr;
+  Context *m_on_finish = nullptr;
+
+  SnapSeqs m_snap_seqs;
+  bool m_snap_seqs_updated = false;
+
+  bool prune_snap_map(SnapSeqs *snap_seqs);
+
+  void refresh_image();
+  void handle_refresh_image(int r);
+
+  void preprocess_event();
+  int preprocess_snap_rename(librbd::journal::SnapRenameEvent &event);
+
+  void update_client();
+  void handle_update_client(int r);
+
+  void finish(int r);
+
+};
+
+} // namespace journal
+} // namespace image_replayer
+} // namespace mirror
+} // namespace rbd
+
+extern template class rbd::mirror::image_replayer::journal::EventPreprocessor<librbd::ImageCtx>;
+
+#endif // RBD_MIRROR_IMAGE_REPLAYER_EVENT_PREPROCESSOR_H