From d2e8b812051323cdea0d594df1d2ae2cb3e287b1 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Mon, 15 Jun 2020 15:22:23 -0600 Subject: [PATCH] cephadm: skip any invalid fsid(s) during infer Fixes: https://tracker.ceph.com/issues/45999 Signed-off-by: Michael Fritch --- src/cephadm/cephadm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index a195338d5bf5d..8c6aeb2c4c75e 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1072,9 +1072,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) -- 2.39.5