From: Sage Weil <sage@newdream.net>
Date: Thu, 29 Dec 2011 19:24:12 +0000 (-0800)
Subject: librados: check for monclient::init() error
X-Git-Tag: v0.40~104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04c8db001a4ed02ef7335ed01ce73ce9ab28dc9d;p=ceph.git

librados: check for monclient::init() error

I think this fixes #1835.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/librados.cc b/src/librados.cc
index bd118d8d70b9..6e402abd7d9e 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -952,7 +952,12 @@ int librados::RadosClient::connect()
   ldout(cct, 1) << "setting wanted keys" << dendl;
   monclient.set_want_keys(CEPH_ENTITY_TYPE_MON | CEPH_ENTITY_TYPE_OSD);
   ldout(cct, 1) << "calling monclient init" << dendl;
-  monclient.init();
+  err = monclient.init();
+  if (err) {
+    ldout(cct, 0) << conf->name << " initialization error " << cpp_strerror(-err) << dendl;
+    shutdown();
+    goto out;
+  }
 
   err = monclient.authenticate(conf->client_mount_timeout);
   if (err) {