ceph-disk: reduce the scope of activate_lock.

Hold the FileLock when mounting the directory. Release the FileLock when start the osd and connect to the monitor. So when the cluster is rebooted, all directories will be mounted and all osd service will be enabled even the monitor is not ready.
Fixes:https://tracker.ceph.com/issues/22795

Signed-off-by: zhaokun <develop@hikdata.com>

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 315b8ab55e2340bb8dfd0eef7a99e315edc63326..dba0454828ddb09ed8bf1a4ab7f0ff11adc21082 100644 (file)
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -3805,24 +3805,24 @@ def main_activate(args):
             LOG.info("activate: Journal not present, not starting, yet")
             return
 
-        if (not args.no_start_daemon and args.mark_init == 'none'):
-            command_check_call(
-                [
-                    'ceph-osd',
-                    '--cluster={cluster}'.format(cluster=cluster),
-                    '--id={osd_id}'.format(osd_id=osd_id),
-                    '--osd-data={path}'.format(path=osd_data),
-                    '--osd-journal={journal}'.format(journal=osd_journal),
-                ],
-            )
+    if (not args.no_start_daemon and args.mark_init == 'none'):
+        command_check_call(
+            [
+                'ceph-osd',
+                '--cluster={cluster}'.format(cluster=cluster),
+                '--id={osd_id}'.format(osd_id=osd_id),
+                '--osd-data={path}'.format(path=osd_data),
+                '--osd-journal={journal}'.format(journal=osd_journal),
+            ],
+        )
 
-        if (not args.no_start_daemon and
-                args.mark_init not in (None, 'none')):
+    if (not args.no_start_daemon and
+            args.mark_init not in (None, 'none')):
 
-            start_daemon(
-                cluster=cluster,
-                osd_id=osd_id,
-            )
+        start_daemon(
+            cluster=cluster,
+            osd_id=osd_id,
+        )
 
 
 def main_activate_lockbox(args):
@@ -4173,10 +4173,10 @@ def main_activate_space(name, args):
             reactivate=args.reactivate,
         )
 
-        start_daemon(
-            cluster=cluster,
-            osd_id=osd_id,
-        )
+    start_daemon(
+        cluster=cluster,
+        osd_id=osd_id,
+    )
 
 
 ###########################