-
Notifications
You must be signed in to change notification settings - Fork 92
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CA-135612: Add experimental support for NFSv4 to SM #109
Conversation
Can one of the admins verify this patch? |
retest this please |
Please ignore the build result - the check job requires #151 to be merged first |
retest this please |
Coverage increased (+0.59%) when pulling 7bc1d14277516e916835994143a370f583107611 on robertbreker:experimentalnfsv4 into b890746 on xapi-project:master. |
Coverage increased (+0.59%) when pulling 8626c3c44162d4204f93988e59b3438bf02690e0 on robertbreker:experimentalnfsv4 into b890746 on xapi-project:master. |
Coverage increased (+0.59%) when pulling 0d4524d7c7ebc311675e2e2c63df79e02c9c2f76 on robertbreker:experimentalnfsv4 into b890746 on xapi-project:master. |
Coverage increased (+0.58%) when pulling 7b9a6898151e44d4927ecca68201b46359dbcfae on robertbreker:experimentalnfsv4 into b890746 on xapi-project:master. |
Coverage increased (+0.58%) when pulling 9b35f8cb05532a114103f7f3b9dc21d52b47d434 on robertbreker:experimentalnfsv4 into b890746 on xapi-project:master. |
Coverage increased (+0.58%) when pulling dd40b04c6e81911d3e602f1cc5fc99efdff7ac3d on robertbreker:experimentalnfsv4 into b890746 on xapi-project:master. |
Coverage increased (+0.58%) when pulling fa12687adc15b4101453d0aad8c0b145f040b249 on robertbreker:experimentalnfsv4 into bce4501 on xapi-project:master. |
Hi @matelakat, this is now ready for review. The code is vastly cherry-picked, but:
Thanks, |
@robertbreker - Thaks for this change, it's very useful, however, it would be better to be able to pick the changes as they are in xs64bit, without any adjustment. So I used your original commits, cherry picked them on top of master, and ran the unit tests. The unit tests failed of course, so I used them to drive my decisions, and identify which changes would need to be picked to make sure that the tests pass. This is how I came to the pull request #202 It means, that cherry picking your original changes on top of #202 will yield all tests to pass without any modifications. So I would suggest, we first get #202 merged, then we can pick the original changes without any modification. It's again a sign of how useful those unit tests can be! |
@robertbreker - is there any chance you can create a separate pull request for the CA-141409 commits? |
@matelakat - I wish I could, but that's unfortunately not straight forward because of dependencies. |
@robertbreker - I created a new PR with your changes to xs64bit: #205 |
What should we do with this PR? |
@robertbreker Many of the changes related to NFSv4 have been ported from xs64bit to master. |
Why create a new pull request instead of updating this one? |
True, we could reuse the same pull request and update it with only what is required for master now! |
@robertbreker I'll import only the missing chunks from the pull request, resolve conflicts and merge them onto master. I'll also close this pull request when I do the same. Thanks |
We are unintentionally using nfsversion 4 on trunk. This is because the command mount.nfs defaults to using nfsversion 4 instead of version 3 in our environment on trunk. This commit specifies the nfsversion additionally in the mount options, to make sure that we default to nfsversion 3 again, and that the default setting can be switched intentionally. Signed-off-by: Robert Breker <robert.breker@citrix.com>
…on 3 again Signed-off-by: Robert Breker <robert.breker@citrix.com>
ff824f1
to
f0f0a62
Compare
I updated this PR after discussing this with @siddharthv. |
GitHub: closes xapi-project#109 on xapi-project/sm
This enables the specification of the NFS version (3,4) in the device-config of
ISOSRs(type=nfs) and NFSSRs.
E.g. device-config:nfsversion=4
Signed-off-by: Robert Breker robert.breker@citrix.com