objecter: Don't warn on multiple admin sockets

Suppress messages about failure to register admin sockets
if they are EEXIST, because this is a case that can occur
naturally if multiple objecter/librados clients are instantiated
within the same process.

Signed-off-by: John Spray <john.spray@inktank.com>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 1166651de239f1516ed9ceba5790c6bdeaefb06a..8c5feb631a801007a4a8d4f10beafef8f6403b27 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -248,7 +248,10 @@ void Objecter::init_unlocked()
                                           "objecter_requests",
                                           m_request_state_hook,
                                           "show in-progress osd requests");
-  if (ret < 0) {
+
+  /* Don't warn on EEXIST, happens if multiple ceph clients
+   * are instantiated from one process */
+  if (ret < 0 && ret != -EEXIST) {
     lderr(cct) << "error registering admin socket command: "
               << cpp_strerror(ret) << dendl;
   }