RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 00:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #31341 into master

Browse Source 
* refs/pull/31341/head:
	ceph-daemon: only set up /var/run/ceph/$fsid if it exists

Reviewed-by: Sebastian Wagner <swagner@suse.com>
This commit is contained in:
Sage Weil 2019-11-04 10:34:57 -06:00
commit 8afa48835e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ceph-daemon
View File

@ -368,7 +368,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