]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tools/rados: Check return value of connect 14095/head
authorBrad Hubbard <bhubbard@redhat.com>
Tue, 21 Mar 2017 02:22:20 +0000 (12:22 +1000)
committerShinobu Kinjo <shinobu@redhat.com>
Thu, 23 Mar 2017 03:37:43 +0000 (12:37 +0900)
Fail gracefully if Rados::connect returns an error.

Fixes: http://tracker.ceph.com/issues/19319
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit c119091ef0844e4a1ddd790a8bfef8f06bb57d58)

src/tools/rados/RadosImport.cc

index 4f72142d6576056c65800b12adc7963d958898dc..1e8423c6b413ac8e8e7385e6c886ab2246c65e38 100644 (file)
@@ -42,7 +42,11 @@ int RadosImport::import(std::string pool, bool no_overwrite)
     cerr << "Error " << ret << " in cluster.conf_read_env" << std::endl;
     return ret;
   }
-  cluster.connect();
+  ret = cluster.connect();
+  if (ret) {
+    cerr << "Error " << ret << " in cluster.connect" << std::endl;
+    return ret;
+  }
 
   ret = cluster.ioctx_create(pool.c_str(), ioctx);
   if (ret < 0) {