From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Nov 2019 22:47:59 +0000 (-0600)
Subject: ceph-daemon: fix fsid inference
X-Git-Tag: v15.1.0~796^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82cbfbe91966ef858038a1b1dc06c186ecc8a9d9;p=ceph.git

ceph-daemon: fix fsid inference

All return paths should return func.

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

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 36a8989e1ccd..f9e27179a322 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')