Skip to content
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

fix(xen-orchestra/fs): nfs port #8085

Merged
merged 2 commits into from
Nov 15, 2024
Merged

fix(xen-orchestra/fs): nfs port #8085

merged 2 commits into from
Nov 15, 2024

Conversation

stephane-m-dev
Copy link
Contributor

@stephane-m-dev stephane-m-dev commented Oct 30, 2024

Description

XO-375

In "remotes", fix nfs port if specified.
The problem : port was specified in url, when it should be specified as an option.

Options already exist. It should continue to work as before.

Result of tests in XO when port and options are specified / not specified :

Capture d’écran du 2024-10-30 11-10-02

Result of mount when port and options are specified / not specified :

{ 
  remote: 'nfs://192.168.1.29:/home/stephane/Public/nfs', 
  options: '' 
}
mount [
  '-o',
  '',
  '-t',
  'nfs',
  '192.168.1.29:/home/stephane/Public/nfs',
  '/run/xo-server/mounts/95a7ea9c-17b0-4a91-9595-9c0417693442'
]

{
  remote: 'nfs://192.168.1.29:/home/stephane/Public/nfs',
  options: 'noexec'
}
mount [
  '-o',
  'noexec',
  '-t',
  'nfs',
  '192.168.1.29:/home/stephane/Public/nfs',
  '/run/xo-server/mounts/bb99b303-2ca7-45f0-b8b9-5db254459c74'
]

{
  remote: 'nfs://192.168.1.29:2049:/home/stephane/Public/nfs',
  options: 'port=2049,noexec'
}
mount [
  '-o',
  'port=2049,noexec',
  '-t',
  'nfs',
  '192.168.1.29:/home/stephane/Public/nfs',
  '/run/xo-server/mounts/abbd08fe-f0be-4a3c-8c97-76a8d8808981'
]

{
  remote: 'nfs://192.168.1.29:/mnt/disk3?encryptionKey=%22xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxw%22',
  options: ''
}
mount [
  '-o',
  '',
  '-t',
  'nfs',
  '192.168.1.29:/mnt/disk3',
  '/run/xo-server/mounts/2cf7babd-64eb-4325-8c32-002d7a436a4e'
]

{
  remote: 'nfs://192.168.1.29:2049:/home/stephane/Public/nfs',
  options: 'port=2049'
}
mount [
  '-o',
  'port=2049',
  '-t',
  'nfs',
  '192.168.1.29:/home/stephane/Public/nfs',
  '/run/xo-server/mounts/2a13771e-8244-4183-966e-271ca94750dd'
]

Checklist

  • Commit
    • Title follows commit conventions
    • Reference the relevant issue (Fixes #007, See xoa-support#42, See https://...)
    • If bug fix, add Introduced by
  • Changelog
    • If visible by XOA users, add changelog entry
    • Update "Packages to release" in CHANGELOG.unreleased.md
  • PR
    • If UI changes, add screenshots
    • If not finished or not tested, open as Draft

Review process

This 2-passes review process aims to:

  • develop skills of junior reviewers
  • limit the workload for senior reviewers
  • limit the number of unnecessary changes by the author
  1. The author creates a PR.
  2. Review process:
    1. The author assigns the junior reviewer.
    2. The junior reviewer conducts their review:
      • Resolves their comments if they are addressed.
      • Adds comments if necessary or approves the PR.
    3. The junior reviewer assigns the senior reviewer.
    4. The senior reviewer conducts their review:
      • If there are no unresolved comments on the PR → merge.
      • Otherwise, we continue with 3.
  3. The author responds to comments and/or makes corrections, and we go back to 2.

Notes:

  1. The author can request a review at any time, even if the PR is still a Draft.
  2. In theory, there should not be more than one reviewer at a time.
  3. The author should not make any changes:
    • When a reviewer is assigned.
    • Between the junior and senior reviews.

Copy link
Contributor

@b-Nollet b-Nollet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget changelog entry

@stephane-m-dev stephane-m-dev changed the title fix(xen-orchestra/fs): nfs port + mount do not use -o if no options fix(xen-orchestra/fs): nfs port Oct 30, 2024
Copy link
Contributor

@b-Nollet b-Nollet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might have been some mistakes during rebase, I think you're adding two additional changelog entries from last month.

@stephane-m-dev
Copy link
Contributor Author

There might have been some mistakes during rebase, I think you're adding two additional changelog entries from last month.

Done!

@b-Nollet
Copy link
Contributor

@fbeauchamp PR seems ready to be merged

@fbeauchamp
Copy link
Collaborator

looks goot to me, will be merged when the patch release is done

@fbeauchamp fbeauchamp merged commit 99c56d2 into master Nov 15, 2024
1 check passed
@fbeauchamp fbeauchamp deleted the fix-nfs-port branch November 15, 2024 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants