]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd: error out if import image format failed 13957/head
authorwangzhengyong <wangzhengyong@cmss.chinamobile.com>
Tue, 14 Mar 2017 08:38:48 +0000 (16:38 +0800)
committerwangzhengyong <wangzhengyong@cmss.chinamobile.com>
Thu, 16 Mar 2017 07:50:31 +0000 (15:50 +0800)
Signed-off-by: wangzhengyong@cmss.chinamobile.com
src/tools/rbd/action/Import.cc

index f012bbbf0b591e77bfadec839b3ae8555ee0cd45..1217ee500f05c3776f8d0667edb8b32ec876fd55 100644 (file)
@@ -752,6 +752,11 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
   } else {
     r = do_import_v2(fd, image, size, imgblklen, pc);
   }
+  if (r < 0) {
+    std::cerr << "rbd: failed to import image" << std::endl;
+    image.close();
+    goto err;
+  }
 
   r = image.close();
 err: