Change in vdsm[master]: BZ#855729 - Default to NFSv3 if version not specified

gpadgett at redhat.com gpadgett at redhat.com
Thu Sep 20 20:45:21 UTC 2012


Greg Padgett has uploaded a new change for review.

Change subject: BZ#855729 - Default to NFSv3 if version not specified
......................................................................

BZ#855729 - Default to NFSv3 if version not specified

Unexpectedly switching to NFSv4 during e.g. upgrades from 3.0 to 3.1
can cause permissions issues.  Unless explicitly set, use v3 as the
default.

Change-Id: I2619428ecf6283bc11a252a98caa3e891b20b795
Signed-off-by: Greg Padgett <gpadgett at redhat.com>
---
M vdsm/storage/storageServer.py
1 file changed, 3 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/8110/1

diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index a7dda01..e89a4ca 100644
--- a/vdsm/storage/storageServer.py
+++ b/vdsm/storage/storageServer.py
@@ -229,37 +229,17 @@
 
     @property
     def version(self):
-        if self._version is not None:
-            return self._version
+        return self._version
 
-        # Version was not specified but if we are connected we can figure out
-        # the negotiated version
-        mnt = self._mountCon.getMountObj()
-        try:
-            rec = mnt.getRecord()
-            if rec.fs_vfstype == "nfs4":
-                return 4
-            else:
-                return 3
-        except OSError:
-            # We are not connected
-            pass
-
-        # Return -1 to signify the version has not been negotiated yet
-        return -1
-
-
-    def __init__(self, export, timeout=600, retrans=6, version=None):
+    def __init__(self, export, timeout=600, retrans=6, version=3):
         self._remotePath = normpath(export)
-        self._version = version
         options = self.DEFAULT_OPTIONS[:]
         self._timeout = timeout
         self._version = version
         self._retrans = retrans
         _addIntegerOption(options, "timeo", timeout)
         _addIntegerOption(options, "retrans", retrans)
-        if version:
-            _addIntegerOption(options, "vers", version)
+        _addIntegerOption(options, "vers", version)
 
         self._mountCon = MountConnection(export, "nfs", ",".join(options))
 


--
To view, visit http://gerrit.ovirt.org/8110
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2619428ecf6283bc11a252a98caa3e891b20b795
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadgett at redhat.com>


More information about the vdsm-patches mailing list