rbd-mirror: use generalized deep copy for image sync

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
idryomov · Nov 6, 2017 · 73f50a1 · 73f50a1
1 parent 5a1a217
commit 73f50a1
Show file tree

Hide file tree

Showing 21 changed files with 248 additions and 5,751 deletions.
diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt
@@ -29,11 +29,6 @@ add_executable(unittest_rbd_mirror
   image_replayer/test_mock_GetMirrorImageIdRequest.cc
   image_replayer/test_mock_PrepareLocalImageRequest.cc
   image_replayer/test_mock_PrepareRemoteImageRequest.cc
-  image_sync/test_mock_ImageCopyRequest.cc
-  image_sync/test_mock_MetadataCopyRequest.cc
-  image_sync/test_mock_ObjectCopyRequest.cc
-  image_sync/test_mock_SnapshotCopyRequest.cc
-  image_sync/test_mock_SnapshotCreateRequest.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/test_mock_BootstrapRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc
@@ -63,8 +63,8 @@ struct ImageSync<librbd::MockTestImageCtx> {
   static ImageSync* create(
       librbd::MockTestImageCtx *local_image_ctx,
       librbd::MockTestImageCtx *remote_image_ctx,
-      SafeTimer *timer, Mutex *timer_lock, const std::string &mirror_uuid,
-      ::journal::MockJournaler *journaler,
+      SafeTimer *timer, Mutex *timer_lock,
+      const std::string &mirror_uuid, ::journal::MockJournaler *journaler,
       librbd::journal::MirrorPeerClientMeta *client_meta, ContextWQ *work_queue,
       InstanceWatcher<librbd::MockTestImageCtx> *instance_watcher,
       Context *on_finish, ProgressContext *progress_ctx) {