From: wangzhengyong <wangzhengyong@cmss.chinamobile.com>
Date: Tue, 14 Mar 2017 08:38:48 +0000 (+0800)
Subject: rbd: error out if import image format failed
X-Git-Tag: v12.0.2~177^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc0f1d0d3d9ee1125c636db66fae3cd4aacfcd3b;p=ceph.git

rbd: error out if import image format failed

Signed-off-by: wangzhengyong@cmss.chinamobile.com
---

diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc
index f012bbbf0b59..1217ee500f05 100644
--- a/src/tools/rbd/action/Import.cc
+++ b/src/tools/rbd/action/Import.cc
@@ -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: