From d89613f52dee83c308a2b169ba1c2869c16ac9d7 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Sun, 31 Jan 2021 15:24:32 +0100 Subject: [PATCH] qa/tasks/rbd: don't wait for krbd symlink to be created/removed 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 --- qa/tasks/rbd.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/qa/tasks/rbd.py b/qa/tasks/rbd.py index 1a854da86a7a3..f17543c15b0ef 100644 --- a/qa/tasks/rbd.py +++ b/qa/tasks/rbd.py @@ -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'] -- 2.39.5