[PATCH] skip loading keyrings when auth supported = none

[Paul Collins <paul.collins@xxxxxxxxxxxxx>]

If the cluster is not currently using authentication, then it's
possible that no keyrings were ever created.  Proceed with monitor
initialization regardless and explain what we did.

With this patch applied, my 0.48 monitor cluster starts up
correctly even when no keyring files are present in the monitors'
data directories.

Signed-off-by: Paul Collins <paul.collins@xxxxxxxxxxxxx>
---
 src/mon/Monitor.cc |   40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c415dbf..bdd6a91 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -322,22 +322,26 @@ int Monitor::init()
     extract_save_mon_key(keyring);
   }
 
-  ostringstream os;
-  os << g_conf->mon_data << "/keyring";
-  int r = keyring.load(cct, os.str());
-  if (r < 0) {
-    EntityName mon_name;
-    mon_name.set_type(CEPH_ENTITY_TYPE_MON);
-    EntityAuth mon_key;
-    if (key_server.get_auth(mon_name, mon_key)) {
-      dout(1) << "copying mon. key from old db to external keyring" << dendl;
-      keyring.add(mon_name, mon_key);
-      bufferlist bl;
-      keyring.encode_plaintext(bl);
-      store->put_bl_ss(bl, "keyring", NULL);
-    } else {
-      derr << "unable to load initial keyring " << g_conf->keyring << dendl;
-      return r;
+  if (auth_supported.is_supported_auth(CEPH_AUTH_NONE)) {
+    dout(10) << "auth supported = none, no keys to load" << dendl;
+  } else {
+    ostringstream os;
+    os << g_conf->mon_data << "/keyring";
+    int r = keyring.load(cct, os.str());
+    if (r < 0) {
+      EntityName mon_name;
+      mon_name.set_type(CEPH_ENTITY_TYPE_MON);
+      EntityAuth mon_key;
+      if (key_server.get_auth(mon_name, mon_key)) {
+	dout(1) << "copying mon. key from old db to external keyring" << dendl;
+	keyring.add(mon_name, mon_key);
+	bufferlist bl;
+	keyring.encode_plaintext(bl);
+	store->put_bl_ss(bl, "keyring", NULL);
+      } else {
+	derr << "unable to load initial keyring " << g_conf->keyring << dendl;
+	return r;
+      }
     }
   }
 
@@ -346,8 +350,8 @@ int Monitor::init()
 
   // unlock while registering to avoid mon_lock -> admin socket lock dependency.
   lock.Unlock();
-  r = admin_socket->register_command("mon_status", admin_hook,
-				     "show current monitor status");
+  int r = admin_socket->register_command("mon_status", admin_hook,
+					 "show current monitor status");
   assert(r == 0);
   r = admin_socket->register_command("quorum_status", admin_hook,
 					 "show current quorum status");
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html