From 82cbfbe91966ef858038a1b1dc06c186ecc8a9d9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 21 Nov 2019 16:47:59 -0600 Subject: [PATCH] ceph-daemon: fix fsid inference All return paths should return func. Signed-off-by: Sage Weil --- src/ceph-daemon/ceph-daemon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon index 36a8989e1cc..f9e27179a32 100755 --- a/src/ceph-daemon/ceph-daemon +++ b/src/ceph-daemon/ceph-daemon @@ -235,7 +235,7 @@ def infer_fsid(func): def _infer_fsid(): if args.fsid: logger.debug('Using specified fsid: %s' % args.fsid) - return + return func() fsid_list = [] for i in os.listdir(args.data_dir): @@ -246,7 +246,7 @@ def infer_fsid(func): if not fsid_list: # TODO: raise? - return + return func() if len(fsid_list) > 1: raise RuntimeError('Cannot infer fsid, must specify --fsid') -- 2.39.5