Merge pull request #13957 from wangzhengyong/import

rbd: error out if import image format failed

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc src/tools/rbd/action/Import.cc
index db0f9e08fd1dffc13b9aa1880342812bb224b816,1217ee500f05c3776f8d0667edb8b32ec876fd55..5367b25a5c094e668bb224677b0c2b3fe00c8733
--- 1/src/tools/rbd/action/Import.cc
--- 2/src/tools/rbd/action/Import.cc
+++ b/src/tools/rbd/action/Import.cc
@@@ -798,10 -748,15 +798,15 @@@ static int do_import(librbd::RBD &rbd, 
    }
  
    if (import_format == 1) {
 -    r = do_import_v1(fd, image, size, imgblklen, pc);
 +    r = do_import_v1(fd, image, size, imgblklen, pc, sparse_size);
    } else {
 -    r = do_import_v2(fd, image, size, imgblklen, pc);
 +    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: