tools/rbd: set order to default value if it is not specified in options.

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>

diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc
index 2eee2e8c4131d327fd3320ef4a0f10c690fb368e..b69bd48e776a590a8c2dc87c69998e87d98e9eb4 100644 (file)
--- a/src/tools/rbd/action/Import.cc
+++ b/src/tools/rbd/action/Import.cc
@@ -74,8 +74,9 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
   assert(imgname);
 
   uint64_t order;
-  r = opts.get(RBD_IMAGE_OPTION_ORDER, &order);
-  assert(r == 0);
+  if (opts.get(RBD_IMAGE_OPTION_ORDER, &order) != 0) {
+    order = g_conf->rbd_default_order;
+  }
 
   // try to fill whole imgblklen blocks for sparsification
   uint64_t image_pos = 0;