From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 6 Apr 2017 00:11:33 +0000 (-0400)
Subject: Merge pull request #13957 from wangzhengyong/import
X-Git-Tag: v12.0.2~177
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=184df4abcf102957b73e5df4d63270163aa4dd50;p=ceph.git

Merge pull request #13957 from wangzhengyong/import

rbd: error out if import image format failed

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

184df4abcf102957b73e5df4d63270163aa4dd50
diff --cc src/tools/rbd/action/Import.cc
index db0f9e08fd1,1217ee500f0..5367b25a5c0
--- a/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: