Skip to content

Synchronise 2026.1 with upstream#15

Merged
Alex-Welsh merged 4 commits into
stackhpc/2026.1from
upstream/2026.1-2026-06-03
Jun 3, 2026
Merged

Synchronise 2026.1 with upstream#15
Alex-Welsh merged 4 commits into
stackhpc/2026.1from
upstream/2026.1-2026-06-03

Conversation

@github-actions

@github-actions github-actions Bot commented Jun 3, 2026

Copy link
Copy Markdown

This PR contains a snapshot of 2026.1 from upstream stable/2026.1.

kpawar89 and others added 3 commits May 14, 2026 08:20
When all_squash=true metadata is set on an NFS share and access rules
are updated on a readable DP (data protection) replica, the driver
was calling set_pcuser_for_volume on the SnapMirror destination
volume. ONTAP rejects this with error code 160 because DP volumes are
read-only and their user attribute cannot be modified.

Fix by propagating the replica flag (True for non-active readable DP
replicas, False otherwise) from lib_base into the NFS protocol helper
update_access() method. When replica=True the pcuser configuration step
is skipped with an informational log message.

The replica flag is set correctly in all callers:
- update_access(): True for non-active readable replicas (DP volumes)
- create_replica(): True (new replica is a DP volume)
- promote_replica(): False (promoted replica becomes read-write)
- _safe_change_replica_source(): True (old source becomes new DP target)

Change-Id: I48fd7e4aced6c14fcd6dae053833ff786ec507df
Signed-off-by: Kiran Pawar <kinpaa@gmail.com>
(cherry picked from commit 74a8848)
When free_capacity_gb, total_capacity_gb, or provisioned_capacity_gb
is None, the weigher previously raised a TypeError by attempting
arithmetic with None. Following the existing 'unknown' treatment,
None values are now handled as worst-case (sorts to bottom), which
is safer than assuming zero provisioned capacity.

Closes-bug: #2145805
Change-Id: I6e7e9dce772beebadd6199039aed5906e6ba24e6
Signed-off-by: Kiran Pawar <kinpaa@gmail.com>
(cherry picked from commit 3c04a17)
@github-actions github-actions Bot requested a review from a team as a code owner June 3, 2026 09:13
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels Jun 3, 2026
@Alex-Welsh

Copy link
Copy Markdown
Member

Merged in stackhpc/2026.1, and CI is running now

@Alex-Welsh

Copy link
Copy Markdown
Member

Not sure why it needed manual intervention though

@Alex-Welsh Alex-Welsh merged commit 3ff12dc into stackhpc/2026.1 Jun 3, 2026
3 checks passed
@Alex-Welsh Alex-Welsh deleted the upstream/2026.1-2026-06-03 branch June 3, 2026 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants