From: Sage Weil <sage@redhat.com>
Date: Wed, 23 Oct 2019 15:30:40 +0000 (-0500)
Subject: ceph-daemon: fix 'ls'
X-Git-Tag: v15.1.0~1179^2~13
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0c318ed2b21051b780a6277dfbd6435faf7d5ef0;p=ceph-ci.git

ceph-daemon: fix 'ls'

This broke when we added the crash service.

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index e3426ca5447..e74ce9146f1 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -1191,7 +1191,10 @@ def command_ls():
             elif is_fsid(i):
                 fsid = i
                 for j in os.listdir(os.path.join(args.data_dir, i)):
-                    (daemon_type, daemon_id) = j.split('.', 1)
+                    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))