RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 14:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/rbd: don't wait for krbd symlink to be created/removed

Browse Source 
Commit 3754c665a1 (":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>
This commit is contained in:
Ilya Dryomov 2021-01-31 15:24:32 +01:00
parent 0357c0215b
commit d89613f52d
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qa/tasks/rbd.py
View 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']