From cc0f1d0d3d9ee1125c636db66fae3cd4aacfcd3b Mon Sep 17 00:00:00 2001 From: wangzhengyong Date: Tue, 14 Mar 2017 16:38:48 +0800 Subject: [PATCH] rbd: error out if import image format failed Signed-off-by: wangzhengyong@cmss.chinamobile.com --- src/tools/rbd/action/Import.cc | 5 +++++ 1 file changed, 5 insertions(+) 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: -- 2.47.3