From: Michael Fritch <mfritch@suse.com>
Date: Mon, 15 Jun 2020 21:22:23 +0000 (-0600)
Subject: cephadm: skip any invalid fsid(s) during infer
X-Git-Tag: v15.2.5~147^2~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aecab3306027acc57a7d41441b839b9f1b088bd1;p=ceph.git

cephadm: skip any invalid fsid(s) during infer

Fixes: https://tracker.ceph.com/issues/45999
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d2e8b812051323cdea0d594df1d2ae2cb3e287b1)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 0ff70b01c94..5b1c2fbd411 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1075,9 +1075,14 @@ def infer_fsid(func):
         fsids = set()
         daemon_list = list_daemons(detail=False)
         for daemon in daemon_list:
-            if 'name' not in args or not args.name:
+            if not is_fsid(daemon['fsid']):
+                # 'unknown' fsid
+                continue
+            elif 'name' not in args or not args.name:
+                # args.name not specified
                 fsids.add(daemon['fsid'])
             elif daemon['name'] == args.name:
+                # args.name is a match
                 fsids.add(daemon['fsid'])
         fsids = sorted(fsids)