auth: remove superfluous error log message

It's also possible that _refresh_config can be called multiple times before the
keyring config has been set (by an arg/env for instance). This would pollute
the log with erroneous error warnings.

MonClient::authenticate already warns about this.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit b2f3b7bc84509ba1a0cf832a5f410f9cb44cb4e2)

diff --git a/src/auth/AuthRegistry.cc b/src/auth/AuthRegistry.cc
index c208f3c7733973508b5b151a0f14ca9696d9d496..edd81f4851be588b350f8a2b13ad9dc1c9e5b905 100644 (file)
--- a/src/auth/AuthRegistry.cc
+++ b/src/auth/AuthRegistry.cc
@@ -175,10 +175,6 @@ void AuthRegistry::_refresh_config()
        }
       }
     }
-    if (_no_keyring_disabled_cephx) {
-      lderr(cct) << "no keyring found at " << cct->_conf->keyring
-              << ", disabling cephx" << dendl;
-    }
   }
 }
 

diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc
index eca429d0bd0489fcef351dd71eb2259f3ae2e217..4baff9cbac5e1890474bb8e8749ffcaf4d66d2cc 100644 (file)
--- a/src/auth/KeyRing.cc
+++ b/src/auth/KeyRing.cc
@@ -51,8 +51,8 @@ int KeyRing::from_ceph_context(CephContext *cct)
       lderr(cct) << "failed to load " << filename
                 << ": " << cpp_strerror(ret) << dendl;
   } else if (conf->key.empty() && conf->keyfile.empty()) {
-    lderr(cct) << "unable to find a keyring on " << conf->keyring
-              << ": " << cpp_strerror(ret) << dendl;
+    /* this can happen during startup when configs are still being set */
+    ldout(cct, 1) << "unable to find a keyring on " << conf->keyring << ": " << cpp_strerror(ret) << dendl;
   }
 
   if (!conf->key.empty()) {