Merge PR ceph#31798 into master

* refs/pull/31798/head:
	ceph-daemon: ceph-volume works without an fsid
	ceph-daemon: several commands that can infer fsids still require them
	ceph-daemon: fix fsid inference

Reviewed-by: Michael Fritch <[email protected]>

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')
@@ -1330,6 +1330,8 @@ def command_shell():
 @infer_fsid
 def command_enter():
     # type: () -> int
+    if not args.fsid:
+        raise RuntimeError('must pass --fsid to specify cluster')
     (daemon_type, daemon_id) = args.name.split('.', 1)
     container_args = [] # type: List[str]
     if args.command:
@@ -1350,7 +1352,8 @@ def command_enter():
 @infer_fsid
 def command_ceph_volume():
     # type: () -> None
-    make_log_dir(args.fsid)
+    if args.fsid:
+        make_log_dir(args.fsid)
 
     mounts = get_container_mounts(args.fsid, 'osd', None)
 
@@ -1393,6 +1396,8 @@ def command_ceph_volume():
 @infer_fsid
 def command_unit():
     # type: () -> None
+    if not args.fsid:
+        raise RuntimeError('must pass --fsid to specify cluster')
     (daemon_type, daemon_id) = args.name.split('.', 1)
     unit_name = get_unit_name(args.fsid, daemon_type, daemon_id)
     call_throws([
@@ -1405,6 +1410,8 @@ def command_unit():
 @infer_fsid
 def command_logs():
     # type: () -> None
+    if not args.fsid:
+        raise RuntimeError('must pass --fsid to specify cluster')
     cmd = [container_path, 'logs']
     if args.follow:
         cmd.append('-f')