RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/cephfs: don't abort if mountpoint is already present

Browse Source 
Instead, let the execution continue.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
This commit is contained in:
Rishabh Dave 2019-08-09 13:41:21 +05:30
parent b7005a2ac2
commit 39a15d091f
3 changed files with 5 additions and 24 deletions

10
qa/tasks/cephfs/fuse_mount.py
View File

@ -52,14 +52,8 @@ class FuseMount(CephFSMount):
log.info('Mounting ceph-fuse client.{id} at {remote} {mnt}...'.format(
id=self.client_id, remote=self.client_remote, mnt=self.mountpoint))
self.client_remote.run(
args=[
'mkdir',
'--',
self.mountpoint,
],
timeout=(15*60)
)
self.client_remote.run(args=['mkdir', '-p', self.mountpoint],
timeout=(15*60))
run_cmd = [
'sudo',

11
qa/tasks/cephfs/kernel_mount.py
View File

@ -27,7 +27,6 @@ class KernelMount(CephFSMount):
self.ipmi_password = ipmi_password
self.ipmi_domain = ipmi_domain
def mount(self, mount_path=None, mount_fs_name=None):
def mount(self, mount_path=None, mount_fs_name=None, mountpoint=None):
if mountpoint is not None:
self.mountpoint = mountpoint
@ -36,14 +35,8 @@ class KernelMount(CephFSMount):
log.info('Mounting kclient client.{id} at {remote} {mnt}...'.format(
id=self.client_id, remote=self.client_remote, mnt=self.mountpoint))
self.client_remote.run(
args=[
'mkdir',
'--',
self.mountpoint,
],
timeout=(5*60),
)
self.client_remote.run(args=['mkdir', '-p', self.mountpoint],
timeout=(5*60))
if mount_path is None:
mount_path = "/"

8
qa/tasks/vstart_runner.py
View File

@ -789,13 +789,7 @@ class LocalFuseMount(FuseMount):
self.mountpoint = mountpoint
self.setupfs(name=mount_fs_name)
self.client_remote.run(
args=[
'mkdir',
'--',
self.mountpoint,
],
)
self.client_remote.run(args=['mkdir', '-p', self.mountpoint])
def list_connections():
self.client_remote.run(