RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34072 from shangdehao1/fix_nfs_bug

Browse Source 
qa/tasks/qemu: fix nfs setup and teardown bug in qemu task

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2020-04-04 09:45:49 -04:00 committed by GitHub
commit 448cd3fe9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qa/tasks/qemu.py
View File

@ -284,8 +284,10 @@ def _setup_nfs_mount(remote, client, service_name, mount_dir):
export = "{dir} *(rw,no_root_squash,no_subtree_check,insecure)".format(
dir=export_dir
)
log.info("Deleting export from /etc/exports...")
remote.run(args=[
'sudo', 'sed', '-i', '/^\/export\//d', "/etc/exports",
'sudo', 'sed', '-i', "\|{export_dir}|d".format(export_dir=export_dir),
'/etc/exports'
])
remote.run(args=[
'echo', export, run.Raw("|"),
@ -318,13 +320,10 @@ def _teardown_nfs_mount(remote, client, service_name):
remote.run(args=[
'sudo', 'umount', export_dir
])
log.info("Deleting exported directory...")
remote.run(args=[
'sudo', 'rm', '-r', '/export'
])
log.info("Deleting export from /etc/exports...")
remote.run(args=[
'sudo', 'sed', '-i', '$ d', '/etc/exports'
'sudo', 'sed', '-i', "\|{export_dir}|d".format(export_dir=export_dir),
'/etc/exports'
])
log.info("Starting NFS...")
if remote.os.package_type == "deb":
@ -456,6 +455,12 @@ def run_qemu(ctx, config):
),
],
)
log.info("Deleting exported directory...")
for client in config.keys():
(remote,) = ctx.cluster.only(client).remotes.keys()
remote.run(args=[
'sudo', 'rm', '-r', '/export'
])
@contextlib.contextmanager