From d98194261d5ff937ddbf61ba14beb468540badb6 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 23 Feb 2021 16:06:56 +0100 Subject: [PATCH] cephadm: Add cephfs-mirror Fixes: https://tracker.ceph.com/issues/47261 Signed-off-by: Sebastian Wagner (cherry picked from commit 8fa941b35d89db6a40f7d2912b69eadf40c5004c) --- src/cephadm/cephadm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 6f21fa002d7f9..5c84da49d950c 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -207,7 +207,7 @@ class TimeoutExpired(Error): class Ceph(object): daemons = ('mon', 'mgr', 'mds', 'osd', 'rgw', 'rbd-mirror', - 'crash') + 'crash', 'cephfs-mirror') ################################## @@ -2270,7 +2270,7 @@ def get_container_mounts(ctx, fsid, daemon_type, daemon_id, mounts[data_dir] = cdata_dir + ':z' if not no_config: mounts[data_dir + '/config'] = '/etc/ceph/ceph.conf:z' - if daemon_type == 'rbd-mirror' or daemon_type == 'crash': + if daemon_type in ['rbd-mirror', 'cephfs-mirror', 'crash']: # these do not search for their keyrings in a data directory mounts[data_dir + '/keyring'] = '/etc/ceph/ceph.client.%s.%s.keyring' % (daemon_type, daemon_id) @@ -2372,7 +2372,10 @@ def get_container(ctx: CephadmContext, name = 'client.rgw.%s' % daemon_id elif daemon_type == 'rbd-mirror': entrypoint = '/usr/bin/rbd-mirror' - name = 'client.rbd-mirror.%s' % daemon_id + name = 'client.cephfs-mirror.%s' % daemon_id + elif daemon_type == 'cephfs-mirror': + entrypoint = '/usr/bin/cephfs-mirror' + name = 'client.cephfs-mirror.%s' % daemon_id elif daemon_type == 'crash': entrypoint = '/usr/bin/ceph-crash' name = 'client.crash.%s' % daemon_id @@ -2924,7 +2927,7 @@ def install_base_units(ctx, fsid): compress sharedscripts postrotate - killall -q -1 ceph-mon ceph-mgr ceph-mds ceph-osd ceph-fuse radosgw rbd-mirror || pkill -1 -x 'ceph-mon|ceph-mgr|ceph-mds|ceph-osd|ceph-fuse|radosgw|rbd-mirror' || true + killall -q -1 ceph-mon ceph-mgr ceph-mds ceph-osd ceph-fuse radosgw rbd-mirror cephfs-mirror || pkill -1 -x 'ceph-mon|ceph-mgr|ceph-mds|ceph-osd|ceph-fuse|radosgw|rbd-mirror|cephfs-mirror' || true endscript missingok notifempty -- 2.39.5