Skip to content

Commit f20f084

Browse files
committed
Merge PR ceph#62031 into main
* refs/pull/62031/head: qa: test fio with multiple versions of NFS Reviewed-by: Kotresh Hiremath Ravishankar <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Venky Shankar <[email protected]>
2 parents 610e81e + 95dcfd9 commit f20f084

File tree

6 files changed

+20
-3
lines changed

6 files changed

+20
-3
lines changed

qa/suites/fs/nfs/nfs-version/$

Whitespace-only changes.

qa/suites/fs/nfs/nfs-version/.qa

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.qa/
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
nfs:
2+
vers: 4.1
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
nfs:
2+
vers: 4.2
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
nfs:
2+
vers: latest

qa/tasks/cephfs/test_nfs.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,19 @@ def _mnt_nfs(self, pseudo_path, port, ip):
379379
tries = 3
380380
while True:
381381
try:
382-
self.ctx.cluster.run(
383-
args=['sudo', 'mount', '-t', 'nfs', '-o', f'port={port}',
384-
f'{ip}:{pseudo_path}', '/mnt'])
382+
# TODO: NFS V4.2 is failing with libaio read.
383+
# TODO: Reference: https://tracker.ceph.com/issues/70203
384+
nfs_version_conf = self.ctx['config'].get('nfs', {})
385+
nfs_version = nfs_version_conf.get('vers', 'latest')
386+
if nfs_version == "latest":
387+
self.ctx.cluster.run(
388+
args=['sudo', 'mount', '-t', 'nfs', '-o', f'port={port}',
389+
f'{ip}:{pseudo_path}', '/mnt'])
390+
else:
391+
self.ctx.cluster.run(
392+
args=['sudo', 'mount', '-t', 'nfs', '-o', f'port={port},vers={nfs_version}',
393+
f'{ip}:{pseudo_path}', '/mnt'])
394+
pass
385395
break
386396
except CommandFailedError:
387397
if tries:

0 commit comments

Comments
 (0)