]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/rbd: don't wait for krbd symlink to be created/removed 39209/head
authorIlya Dryomov <idryomov@gmail.com>
Sun, 31 Jan 2021 14:24:32 +0000 (15:24 +0100)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 1 Feb 2021 16:05:47 +0000 (17:05 +0100)
Commit 3754c665a11e (":qa/tasks/rbd: test qemu on top of rbd
encryption") broke dev_create() for krbd by messing up the "wait
for the symlink to be created by udev" loop.  The rbd tool has been
synchronizing with udev internally since 2014, so rather than fixing
let's just drop it.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
qa/tasks/rbd.py

index 1a854da86a7a3f39604b7743775a7be7f9d6a6d9..f17543c15b0ef23ab1a61d1732414dd51c25f6d7 100644 (file)
@@ -284,13 +284,7 @@ def dev_create(ctx, config):
 
         if encryption_format == 'none':
             device_path[role] = '/dev/rbd/rbd/{image}'.format(image=name)
-            device_specific_args = [
-                run.Raw('&&'),
-                # wait for the symlink to be created by udev
-                'while', 'test', '!', '-e', device_path, run.Raw(';'), 'do',
-                'sleep', '1', run.Raw(';'),
-                'done',
-                ]
+            device_specific_args = []
         else:
             remote.run(
                 args=[
@@ -339,15 +333,7 @@ def dev_create(ctx, config):
             (remote,) = ctx.cluster.only(role).remotes.keys()
 
             if encryption_format == 'none':
-                device_specific_args = [
-                    run.Raw('&&'),
-                    # wait for the symlink to be deleted by udev
-                    'while', 'test', '-e', device_path[role],
-                    run.Raw(';'),
-                    'do',
-                    'sleep', '1', run.Raw(';'),
-                    'done',
-                    ]
+                device_specific_args = []
             else:
                 device_specific_args = ['-t', 'nbd']