]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: pass mirror image mode from create image to enable mirror
authorJason Dillaman <dillaman@redhat.com>
Tue, 4 Feb 2020 16:03:14 +0000 (11:03 -0500)
committerJason Dillaman <dillaman@redhat.com>
Thu, 13 Feb 2020 13:11:17 +0000 (08:11 -0500)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/librbd/image/CreateRequest.cc

index 0888b125e26437f6c0bfd9e8e82c50bac206f6ed..a2fbb89dd5c9e5a23b83e5b43b8ddcbc6b1d37db 100644 (file)
@@ -654,10 +654,8 @@ void CreateRequest<I>::mirror_image_enable() {
   auto ctx = create_context_callback<
     CreateRequest<I>, &CreateRequest<I>::handle_mirror_image_enable>(this);
 
-  // TODO: in future rbd-mirror will want to enable mirroring
-  // not only in journal mode.
   auto req = mirror::EnableRequest<I>::create(
-    m_io_ctx, m_image_id, cls::rbd::MIRROR_IMAGE_MODE_JOURNAL,
+    m_io_ctx, m_image_id, m_mirror_image_mode,
     m_non_primary_global_image_id, m_op_work_queue, ctx);
   req->send();
 }