Skip to content

Synchronise 2025.1 with upstream - #27

Merged
MoteHue merged 7 commits into
stackhpc/2025.1from
upstream/2025.1-2026-10-21
Oct 21, 2026
Merged

MoteHue merged 7 commits into
stackhpc/2025.1from
upstream/2025.1-2026-10-21

Conversation

@github-actions

Copy link
Copy Markdown

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

gouthampacha and others added 7 commits May 13, 2026 15:37
When manila services start simultaneously, they can race to
create the default availability zone. The get-or-create
pattern in _availability_zone_create_if_not_exist was not
handling the case where two services both see the AZ as
missing and both attempt to INSERT, causing a
DBDuplicateEntry on the az_name_uc constraint.

Use a savepoint (nested transaction) around the INSERT so
that a duplicate entry error only rolls back the INSERT
without poisoning the outer session, then retry the GET to
return the AZ that the other service created.

Change-Id: I35f1d9423da17e51b2399d81f2d6261e14323bd9
Closes-Bug: #2008813
Assisted-By: Claude Code (Opus 4.6)
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
(cherry picked from commit 700fb3c)
(cherry picked from commit 30707d1)
(cherry picked from commit 8807d30)
…zation

When RequestContext is initialized, oslo_log's formatters or other
middleware may trigger a call to get_logging_values(), which in turn
calls to_dict().

In Manila's RequestContext, to_dict() is overridden to include specific
attributes like 'read_deleted', 'remote_address', 'timestamp',
'quota_class', and 'service_catalog'. If super().__init__() is called
before these attributes are assigned, any implicit call to to_dict()
during the parent class initialization results in an AttributeError.

This patch moves the assignment of these Manila-specific attributes
before the super().__init__() call to ensure they are available when
referenced by to_dict() through the oslo_context logging chain.

References:
https://opendev.org/openstack/oslo.context/src/commit/044826fb46ffced940c48fb6f07828282c1a0fcd/oslo_context/context.py#L367

Closes-Bug: #2146025
Change-Id: Ie1c4886f804cd892130460afdba1ca44a0655a6e
Signed-off-by: hongp <inyong.hong@samsung.com>
(cherry picked from commit ec23384)
(cherry picked from commit e2de0cf)
_check_snaplock_compatibility() built a NetAppException without
raising it, so shares with a SnapLock share type were created on
clusters that do not have the SnapLock license.

Closes-Bug: #2164525
Change-Id: I1550f6127d955e007c416777fdb63de960804c2c
Signed-off-by: hongp <inyong.hong@samsung.com>
(cherry picked from commit 1e2efe2)
(cherry picked from commit 2f5beea)
(cherry picked from commit 097cc6c)
A public share is visible to all tenants, but users other
than the owner should not be able to modify it. Several
operations skipped the ownership policy check for public
shares. Also, the export location metadata endpoints
resolved the export location globally, instead of within
the share in the request URL.

This commit enforces the ownership checks when
manipulating access rules, creating backups or replicas,
and soft deleting or restoring public shares. Export
location metadata operations are now scoped to the share
in the request URL; export locations that do not belong
to that share now return 404.

Change-Id: Ie283dce157f9c90f5d2ab38c1e74daa7df3ac118
Signed-off-by: Carlos da Silva <ces.eduardo98@gmail.com>
Closes-Bug: #2161412
Closes-Bug: #2168962
(cherry picked from commit d82acf1)
(cherry picked from commit 4fbc4b4)
(cherry picked from commit 42b5a0e)
(cherry picked from commit 0f15084)
@github-actions
github-actions Bot requested a review from a team as a code owner October 21, 2026 12:04
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels Oct 21, 2026
@MoteHue
MoteHue merged commit 13021d0 into stackhpc/2025.1 Oct 21, 2026
4 checks passed
@MoteHue
MoteHue deleted the upstream/2025.1-2026-10-21 branch October 21, 2026 12:48
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