From: Brad Hubbard <bhubbard@redhat.com>
Date: Tue, 21 Mar 2017 02:22:20 +0000 (+1000)
Subject: tools/rados: Check return value of connect
X-Git-Tag: v11.2.1~157^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81f3d860324da49f71b757e6cc8f32966272cf5c;p=ceph.git

tools/rados: Check return value of connect

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)
---

diff --git a/src/tools/rados/RadosImport.cc b/src/tools/rados/RadosImport.cc
index 4f72142d657..1e8423c6b41 100644
--- a/src/tools/rados/RadosImport.cc
+++ b/src/tools/rados/RadosImport.cc
@@ -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) {