From: Sage Weil <sage@redhat.com>
Date: Wed, 28 Feb 2018 22:24:34 +0000 (-0600)
Subject: common/common_init: use unique admin_socket path for unprivileged daemons
X-Git-Tag: v13.0.2~78^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59ee2e8d3b14511e8d07ef8325ac8ca96e051784;p=ceph.git

common/common_init: use unique admin_socket path for unprivileged daemons

These qualify as 'daemon', but their path is usually not unique.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index b365ba67ac78..1c306d3b98c4 100644
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -51,6 +51,12 @@ CephContext *common_preinit(const CephInitParameters &iparams,
     conf->set_val_default("keyring", "$osd_data/keyring");
   }
 
+  if ((flags & CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS)) {
+    // make this unique despite multiple instances by the same name.
+    conf->set_val_default("admin_socket",
+			  "$run_dir/$cluster-$name.$pid.$cctid.asok");
+  }
+
   if (code_env == CODE_ENVIRONMENT_LIBRARY ||
       code_env == CODE_ENVIRONMENT_UTILITY_NODOUT) {
     conf->set_val_default("log_to_stderr", "false");