From: Sage Weil <sage@redhat.com>
Date: Sun, 3 Nov 2019 15:52:59 +0000 (-0600)
Subject: ceph-daemon: only set up /var/run/ceph/$fsid if it exists
X-Git-Tag: v15.1.0~1049^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31341%2Fhead;p=ceph.git

ceph-daemon: only set up /var/run/ceph/$fsid if it exists

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 71cd85f9547b..dae6e37725d4 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -364,7 +364,9 @@ def get_config_and_both_keyrings():
 def get_container_mounts(fsid, daemon_type, daemon_id):
     mounts = {}
     if fsid:
-        mounts['/var/run/ceph/%s' % fsid] = '/var/run/ceph:z'
+        run_path = os.path.join('/var/run/ceph', fsid);
+        if os.path.exists(run_path):
+            mounts[run_path] = '/var/run/ceph:z'
         log_dir = get_log_dir(fsid)
         mounts[log_dir] = '/var/log/ceph:z'
         crash_dir = '/var/lib/ceph/%s/crash' % fsid