Merge pull request #8079 from dillaman/wip-14413

rbd-mirror: integrate with image sync state machine Reviewed-by: Josh Durgin <jdurgin@redhat.com>
ceph · Mar 15, 2016 · e420dc7 · e420dc7
2 parents 5a082ed + a60f38d
commit e420dc7
Show file tree

Hide file tree

Showing 10 changed files with 938 additions and 455 deletions.
diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc
@@ -533,12 +533,6 @@ class ImageReplayer : public rbd::mirror::ImageReplayer {
 	bootstrap_params);
   }
 
-  virtual void on_start_bootstrap_finish(int r) {
-    ASSERT_EQ(0, r);
-    rbd::mirror::ImageReplayer::on_start_bootstrap_finish(
-      get_error("on_start_bootstrap"));
-  }
-
   virtual void on_start_remote_journaler_init_finish(int r) {
     ASSERT_EQ(0, r);
     rbd::mirror::ImageReplayer::on_start_remote_journaler_init_finish(
@@ -563,12 +557,6 @@ class ImageReplayer : public rbd::mirror::ImageReplayer {
     close_local_image(ctx);
   }
 
-  virtual void on_start_local_image_lock_finish(int r) {
-    ASSERT_EQ(0, r);
-    rbd::mirror::ImageReplayer::on_start_local_image_lock_finish(
-      get_error("on_start_local_image_lock"));
-  }
-
   virtual void on_start_wait_for_local_journal_ready_finish(int r) {
     ASSERT_EQ(0, r);
     rbd::mirror::ImageReplayer::on_start_wait_for_local_journal_ready_finish(
@@ -622,13 +610,9 @@ TEST_F(TestImageReplayer, Error_on_stop_##state)			\
 }
 
 TEST_ON_START_ERROR(get_registered_client_status);
-TEST_ON_START_ERROR(bootstrap);
 TEST_ON_START_ERROR(remote_journaler_init);
-TEST_ON_START_ERROR(local_image_open);
-TEST_ON_START_ERROR(local_image_lock);
 TEST_ON_START_ERROR(wait_for_local_journal_ready);
 
 TEST_ON_STOP_ERROR(journal_replay_shut_down);
-TEST_ON_STOP_ERROR(local_image_close);
 TEST_ON_STOP_ERROR(no_error);
 
diff --git a/src/tools/Makefile-client.am b/src/tools/Makefile-client.am
@@ -95,6 +95,9 @@ librbd_mirror_internal_la_SOURCES = \
 	tools/rbd_mirror/Replayer.cc \
 	tools/rbd_mirror/Threads.cc \
 	tools/rbd_mirror/types.cc \
+	tools/rbd_mirror/image_replayer/BootstrapRequest.cc \
+	tools/rbd_mirror/image_replayer/CloseImageRequest.cc \
+	tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc \
 	tools/rbd_mirror/image_sync/ImageCopyRequest.cc \
 	tools/rbd_mirror/image_sync/ObjectCopyRequest.cc \
 	tools/rbd_mirror/image_sync/SnapshotCopyRequest.cc \
@@ -110,6 +113,9 @@ noinst_HEADERS += \
 	tools/rbd_mirror/Replayer.h \
 	tools/rbd_mirror/Threads.h \
 	tools/rbd_mirror/types.h \
+	tools/rbd_mirror/image_replayer/BootstrapRequest.h \
+	tools/rbd_mirror/image_replayer/CloseImageRequest.h \
+	tools/rbd_mirror/image_replayer/OpenLocalImageRequest.h \
 	tools/rbd_mirror/image_sync/ImageCopyRequest.h \
 	tools/rbd_mirror/image_sync/ObjectCopyRequest.h \
 	tools/rbd_mirror/image_sync/SnapshotCopyRequest.h \