Merge pull request #121 from Manimaran-MM/pynfs-01122025

[Enhancement] Fix delegation issues for Ceph and VFS backend

Author: kalebskeithley

ci_utils/nfs_ganesha/nfs_ganesha_setup.py

@@ -9,7 +9,7 @@ class GaneshaManager:
     """
     NFS-Ganesha Setup and Management for CephFS
     """
-    def __init__(self, session, subvol_path, cephfs_name="cephfs", export_id=101):
+    def __init__(self, session, subvol_path, cephfs_name="cephfs", export_id=101, test_type=None):
         """
         Manage NFS-Ganesha setup on a remote session.
 
@@ -22,11 +22,18 @@ def __init__(self, session, subvol_path, cephfs_name="cephfs", export_id=101):
         self.subvol_path = subvol_path
         self.cephfs_name = cephfs_name
         self.export_id = export_id
+        self.test_type = test_type
 
     # ------------------------
     # Internal helpers
     # ------------------------
     def _generate_conf(self):
+        delegations_v4 = ""
+        delegations_export = ""
+
+        if self.test_type == "pynfs":
+            delegations_v4 = "    Delegations = true;"
+            delegations_export = "    delegations = readwrite;"
         return f"""NFS_CORE_PARAM {{
     Enable_NLM = false;
     Enable_RQUOTA = false;
@@ -35,6 +42,7 @@ def _generate_conf(self):
 
 NFSv4 {{
     Enforce_UTF8_Validation = true;
+    {delegations_v4}
 }}
 
 EXPORT_DEFAULTS {{
@@ -49,6 +57,7 @@ def _generate_conf(self):
     Transports = TCP;
     Access_Type = RW;
     Squash = None;
+    {delegations_export}
     FSAL {{
         Name = "CEPH";
     }}

ci_utils/pynfs/pynfs_setup.py

@@ -64,6 +64,7 @@ def run_test(
             )
 
             if self.backend_type == "ceph":
+                # BZ-2415387
                 known_failures = [
                     "WRT17",
                     "MKLINK",
@@ -73,6 +74,7 @@ def run_test(
                     "RNM20"
                 ]
             elif self.backend_type == "acl_vfs":
+                # BZ-2415390
                 known_failures = [
                     "WRT17",
                     "WRT16",
@@ -83,6 +85,7 @@ def run_test(
                     "LOCK20",
                 ]
             elif self.backend_type == "gpfs":
+                # BZ-2416755
                 known_failures = [
                     "WRT17",
                     "WRT16",
@@ -98,28 +101,32 @@ def run_test(
             )
 
             if self.backend_type == "ceph":
+                # BZ-2415388
                 known_failures = [
                     "ALLOC1",
                     "ALLOC2",
                     "ALLOC3",
                     "RNM20",
                     "DELEG2",
                     "DELEG23",
-                    "DELEG1",
                     "DELEG8",
                     "DELEG25",
                     "DELEG24",
-                    "DELEG6",
                     "DELEG7",
-                    "DELEG5",
-                    "DELEG3",
                     "SEQ6",
                     "CSESS21",
                     "CSESS20",
                     "COMP3",
                     "EID9",
+                    "EID4",
                 ]
             elif self.backend_type == "acl_vfs":
+                ## Adding no-deleg option to skip delegation tests for VFS backends BZ-2415392
+                cmd = (
+                    f"cd {self.repo_dir}/nfs4.1 && "
+                    f"./testserver.py {server}:{export} all ganesha nodeleg"
+                    f" --secure --verbose --maketree --showomit --rundeps"
+                )
                 known_failures = [
                     "PUTFH1c",
                     "PUTFH1b",
@@ -131,22 +138,13 @@ def run_test(
                     "RNM3b",
                     "LKPP1c",
                     "LKPP1b",
-                    "DELEG2",
-                    "DELEG23",
-                    "DELEG1",
-                    "DELEG8",
-                    "DELEG25",
-                    "DELEG24",
-                    "DELEG6",
-                    "DELEG7",
-                    "DELEG5",
-                    "DELEG3",
                     "SEQ6",
                     "CSESS21",
                     "CSESS20",
                     "EID9"
                 ]
             elif self.backend_type == "gpfs":
+                # BZ-2416757
                 known_failures = [
                     "XATT5",
                     "XATT7",

tests/test_pynfs_cthon.py

@@ -199,7 +199,8 @@ def test_pynfs_cephfs(create_session):
         ganesha_setup = GaneshaManager(
             session=server_session,
             subvol_path=subvol_path,
-            cephfs_name=ceph_setup.cephfs_name
+            cephfs_name=ceph_setup.cephfs_name,
+            test_type="pynfs"
         )
         ganesha_setup.setup()