Merge pull request ceph#54778 from lxbsz/wip-63141

qa/cephfs: fix root_squash check failure bug

Reviewed-by: Dhairya Parmar <[email protected]>
Reviewed-by: Rishabh Dave <[email protected]>

Author: rishabh-d-dave

qa/tasks/cephfs/caps_helper.py

@@ -66,14 +66,16 @@ def gen_mds_cap_str(caps):
 
     caps = ((perm1, fsname1, cephfs_mntpt1), (perm2, fsname2, cephfs_mntpt2))
     """
-    def _gen_mds_cap_str(perm, fsname=None, cephfs_mntpt='/'):
+    def _gen_mds_cap_str(perm, fsname=None, cephfs_mntpt='/', root_squash=False):
         mds_cap = f'allow {perm}'
         if fsname:
             mds_cap += f' fsname={fsname}'
         if cephfs_mntpt != '/':
             if cephfs_mntpt[0] == '/':
                 cephfs_mntpt = cephfs_mntpt[1:]
             mds_cap += f' path={cephfs_mntpt}'
+        if root_squash:
+            mds_cap += ' root_squash'
         return mds_cap
 
     if len(caps) == 1:

qa/tasks/cephfs/test_admin.py

@@ -1730,11 +1730,9 @@ def test_idem_unaffected_root_squash(self):
         keyring = self.fs.mon_manager.get_keyring(self.client_id)
         moncap = gen_mon_cap_str((('r', self.fs.name,),))
         osdcap = gen_osd_cap_str(((PERM, self.fs.name),))
-        mdscap = gen_mds_cap_str(((PERM, self.fs.name, PATH),))
+        mdscap = gen_mds_cap_str(((PERM, self.fs.name, PATH, True),))
         for cap in (moncap, osdcap, mdscap):
             self.assertIn(cap, keyring)
-        self._remount(self.mount_a, self.fs.name, keyring, PATH)
-        self.captester.run_cap_tests(self.fs, self.client_id, PERM, PATH)
 
     def _get_uid(self):
         return self.mount_a.client_remote.run(