From a15e6d672102d1bc205f66cb4b6ca13fc8568836 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Mon, 6 Dec 2021 00:17:26 -0500 Subject: [PATCH] qa: exclude `nofallback` mount option when using v1-style syntax Otherwise, certain upgrade tests fail which install pacific or earlier releases since the mount helper does not understand this mount option, thereby passing it to the kernel which would does not handle this config causing mount to fail in tests. Note that this mount config is only used during teuthology tests to catch v2-style syntax implementation bugs in the kernel. Fixes: http://tracker.ceph.com/issues/53487 Signed-off-by: Venky Shankar --- qa/tasks/cephfs/kernel_mount.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py index 99ed318ff6c1..9eef819633d1 100644 --- a/qa/tasks/cephfs/kernel_mount.py +++ b/qa/tasks/cephfs/kernel_mount.py @@ -116,8 +116,11 @@ class KernelMount(CephFSMount): opts += ',' + ','.join(mntopts) log.info(f'mounting using device: {stx_opt[0]}') # do not fall-back to old-style mount (catch new-style - # mount syntax bugs in the kernel). - opts += ",nofallback" + # mount syntax bugs in the kernel). exclude this config + # when using v1-style syntax, since old mount helpers + # (pre-quincy) would pass this option to the kernel. + if self.syntax_style != 'v1': + opts += ",nofallback" mount_cmd += self._mount_bin + [stx_opt[0], self.hostfs_mntpt, '-v', '-o', opts] return mount_cmd -- 2.47.3