From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 6 Jun 2016 01:58:08 +0000 (+0800)
Subject: tools/cephfs: check rados.connect() result before goes on
X-Git-Tag: v11.0.0~255^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=089867ccb0f5fe51ada2323e5e39863941eca8fb;p=ceph.git

tools/cephfs: check rados.connect() result before goes on

Which can fail.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/tools/cephfs/JournalTool.cc b/src/tools/cephfs/JournalTool.cc
index 63e5ac110895..867f81638bde 100644
--- a/src/tools/cephfs/JournalTool.cc
+++ b/src/tools/cephfs/JournalTool.cc
@@ -112,7 +112,11 @@ int JournalTool::main(std::vector<const char*> &argv)
   }
 
   dout(4) << "JournalTool: connecting to RADOS..." << dendl;
-  rados.connect();
+  r = rados.connect();
+  if (r < 0) {
+    derr << "couldn't connect to cluster: " << cpp_strerror(r) << dendl;
+    return r;
+  }
  
   auto fs = fsmap->get_filesystem(role_selector.get_ns());
   assert(fs != nullptr);