Merge pull request #13957 from wangzhengyong/import

rbd: error out if import image format failed Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Apr 6, 2017 · 184df4a · 184df4a
2 parents d271e8c + cc0f1d0
commit 184df4a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc
@@ -802,6 +802,11 @@ static int do_import(librbd::RBD &rbd, librados::IoCtx& io_ctx,
   } else {
     r = do_import_v2(fd, image, size, imgblklen, pc, sparse_size);
   }
+  if (r < 0) {
+    std::cerr << "rbd: failed to import image" << std::endl;
+    image.close();
+    goto err;
+  }
 
   r = image.close();
 err: