From ebf1a7b19f3e6a9d89d7cea8ba8ec26668e9f389 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 23 Oct 2019 11:45:03 -0500 Subject: [PATCH] ceph-daemon: include 'crash' unit/item in 'ls' output Signed-off-by: Sage Weil --- src/ceph-daemon | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/ceph-daemon b/src/ceph-daemon index e74ce9146f146..6ea7d24d9c0db 100755 --- a/src/ceph-daemon +++ b/src/ceph-daemon @@ -1191,16 +1191,22 @@ def command_ls(): elif is_fsid(i): fsid = i for j in os.listdir(os.path.join(args.data_dir, i)): - bits = j.split('.') - if len(bits) != 2: - continue - (daemon_type, daemon_id) = bits - (enabled, active) = check_unit(get_unit_name(fsid, - daemon_type, - daemon_id)) + if j == 'crash': + name = 'crash' + unit_name = 'ceph-%s-crash.service' % fsid + (enabled, active) = check_unit(unit_name) + else: + bits = j.split('.') + if len(bits) != 2: + continue + name = j + (daemon_type, daemon_id) = bits + (enabled, active) = check_unit(get_unit_name(fsid, + daemon_type, + daemon_id)) ls.append({ 'style': 'ceph-daemon:v1', - 'name': '%s.%s' % (daemon_type, daemon_id), + 'name': name, 'fsid': fsid, 'enabled': enabled, 'active': active, -- 2.39.5