]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: skip any invalid fsid(s) during infer
authorMichael Fritch <mfritch@suse.com>
Mon, 15 Jun 2020 21:22:23 +0000 (15:22 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Jul 2020 09:39:06 +0000 (11:39 +0200)
Fixes: https://tracker.ceph.com/issues/45999
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d2e8b812051323cdea0d594df1d2ae2cb3e287b1)

src/cephadm/cephadm

index 0ff70b01c943e48d8957859fefc8260804b33902..5b1c2fbd411c44e9bc38b55bf8d1ad25b7c729c7 100755 (executable)
@@ -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)