From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 27 Oct 2020 15:27:33 +0000 (-0400)
Subject: librbd/migration: initialize default source image layout
X-Git-Tag: v16.1.0~702^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ecac0a7563758a70097062095358448e6e9cbdc3;p=ceph.git

librbd/migration: initialize default source image layout

For backing source formats that don't care about the low-level
RBD layout details, provide safe default values for the layout
to ensure that striping logic will still function.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/migration/OpenSourceImageRequest.cc b/src/librbd/migration/OpenSourceImageRequest.cc
index f12d7cb518f5..eb480644426d 100644
--- a/src/librbd/migration/OpenSourceImageRequest.cc
+++ b/src/librbd/migration/OpenSourceImageRequest.cc
@@ -43,7 +43,16 @@ void OpenSourceImageRequest<I>::open_source() {
   // note that all source image ctx properties are placeholders
   *m_src_image_ctx = I::create("", "", m_src_snap_id, m_dst_image_ctx->md_ctx,
                                true);
-  (*m_src_image_ctx)->child = m_dst_image_ctx;
+  auto src_image_ctx = *m_src_image_ctx;
+  src_image_ctx->child = m_dst_image_ctx;
+
+  // use default layout values (can be overridden by source layers later)
+  src_image_ctx->order = 22;
+  src_image_ctx->layout = file_layout_t();
+  src_image_ctx->layout.stripe_count = 1;
+  src_image_ctx->layout.stripe_unit = 1ULL << src_image_ctx->order;
+  src_image_ctx->layout.object_size = 1Ull << src_image_ctx->order;
+  src_image_ctx->layout.pool_id = -1;
 
   auto source_spec = m_migration_info.source_spec;
   if (source_spec.empty()) {
@@ -53,7 +62,7 @@ void OpenSourceImageRequest<I>::open_source() {
       m_migration_info.image_name, m_migration_info.image_id);
   }
 
-  SourceSpecBuilder<I> source_spec_builder{*m_src_image_ctx};
+  SourceSpecBuilder<I> source_spec_builder{src_image_ctx};
   json_spirit::mObject source_spec_object;
   int r = source_spec_builder.parse_source_spec(source_spec,
                                                 &source_spec_object);