sapcc: go back to default settings for nfsv41 (#95)

ensure will apply this to all existing vservers. But not for pfns, this will be left untouched and only new vservers will get the default value. This default value is 'false' beginning with ONTAP 9.8, see https://docs.netapp.com/us-en/ontap/nfs-admin/enable-disable-pnfs-task.html Background: we had trouble with HANA corruption, most likely related to the delegation settings. Change-Id: Iaad11a79cdbd6955a229eaa20c3320492b87a940
sapcc · Jun 7, 2023 · 79078c2 · 79078c2
1 parent d5a81dd
commit 79078c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/manila/share/drivers/netapp/dataontap/client/client_cmode.py b/manila/share/drivers/netapp/dataontap/client/client_cmode.py
@@ -1711,10 +1711,11 @@ def _enable_nfs_protocols(self, versions):
             nfs_service_modify_args['is-nfsv40-enabled'] = 'true'
         if 'nfs4.1' in versions:
             nfs41_opts = {
-                'is-nfsv41-pnfs-enabled': 'true',
-                'is-nfsv41-acl-enabled': 'true',
-                'is-nfsv41-read-delegation-enabled': 'true',
-                'is-nfsv41-write-delegation-enabled': 'true',
+                # 'is-nfsv41-pnfs-enabled': 'false',               # default false, use default on new vservers, don't touch old vservers  # noqa: E501
+                # 'nfsv4-lease-seconds': 30                        # default 30, HANA multiple host systems would like 10 better  # noqa: E501
+                'is-nfsv41-acl-enabled': 'false',               # default false
+                'is-nfsv41-read-delegation-enabled': 'false',   # default false
+                'is-nfsv41-write-delegation-enabled': 'false',  # default false
             }
 
             nfs_service_modify_args.update(nfs41_opts)

diff --git a/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py b/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py
@@ -2614,10 +2614,9 @@ def test_enable_nfs_protocols(self, v3, v40, v41):
             nfs_service_modify_args['is-nfsv40-enabled'] = 'true'
         if v41:
             nfs41_opts = {
-                'is-nfsv41-pnfs-enabled': 'true',
-                'is-nfsv41-acl-enabled': 'true',
-                'is-nfsv41-read-delegation-enabled': 'true',
-                'is-nfsv41-write-delegation-enabled': 'true',
+                'is-nfsv41-acl-enabled': 'false',
+                'is-nfsv41-read-delegation-enabled': 'false',
+                'is-nfsv41-write-delegation-enabled': 'false',
             }
 
             nfs_service_modify_args.update(nfs41_opts)