]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-daemon: only set up /var/run/ceph/$fsid if it exists 31341/head
authorSage Weil <sage@redhat.com>
Sun, 3 Nov 2019 15:52:59 +0000 (09:52 -0600)
committerSage Weil <sage@redhat.com>
Sun, 3 Nov 2019 15:52:59 +0000 (09:52 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/ceph-daemon

index 71cd85f9547b7d88b1227f0b4e1d15dc1c871b7d..dae6e37725d4ae730b8839d2f09ef1ae483619fa 100755 (executable)
@@ -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