Synchronise 2026.1 with upstream - #22
Merged
Merged
Conversation
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)
The LOG.warning call in the create_backup_continue error handler had %(backup). instead of %(backup)s., and the LOG.exception call in the restore_backup_continue error handler had %(share). instead of %(share)s., causing Python to raise a ValueError: incomplete format when a backup continuation failure occurred. This meant the except blocks would fail before the DB update calls could execute, leaving shares and backups permanently stuck in incorrect states. Closes-Bug: #2147529 Closes-Bug: #2148041 Change-Id: I51cca129e24fd2dc831d0ffacbde526e90da7a86 Signed-off-by: sakumbha <sakumbha@redhat.com> (cherry picked from commit 4a9ecb2)
The container driver's docker image was hosted as a tarball on a personal GitHub account since 2016. Switch to pulling from quay.io/openstack-manila where the image is published by manila-image-elements CI. Also fix import_docker_service_image_ubuntu to handle file:// URLs (copy to $FILES before gunzip) and registry references (docker pull + tag). Change-Id: I6106959f0f2dc894b66f1a2c7b5c4a567fdf72a3 Partial-Bug: #2160440 Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com> (cherry picked from commit 1334dc1)
The resource locks mechanism allows filtering locks by project UUIDs. This feature is helpful for identifying the locks and letting their users and/or administrators to quickly filter. However, in the current code path, we were allowing unauthorized cross-project visibility into resource locks data for users that were not members, admin or readers of a given project. This change fixes this issue by adding a check to ensure whether the user has authorization to look up resource locks in the project they are supplying as part of the query. Closes-Bug: #2161287 Change-Id: I03eebf6bb951583378340365dbf69122f124ffc8 Signed-off-by: Carlos da Silva <ces.eduardo98@gmail.com> (cherry picked from commit 8119570)
The LOG.error call was passing the string literal "exc" instead of the exc variable, causing error logs to never show the actual failure reason from a previous share-create attempt. Closes-Bug: #2161592 Change-Id: Ic2d35329f071986d0264ff62be55c8cada31954c Signed-off-by: sakumbha <sakumbha@redhat.com> (cherry picked from commit aeeb082)
Quagga is no longer available on Ubuntu 22.04+. Replace it with FRR (FRRouting), its maintained fork and drop-in replacement. Also fix BGP peering on single-host devstack by giving FRR a separate IPv6 address and using "bgp listen range" to accept connections from any address in the public subnet. Closes-Bug: #1998489 Change-Id: I189eaee03286dc7641537bb3548b4fcafdaed67e Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com> (cherry picked from commit b7037f1)
github-actions
Bot
added
automated
priteau
approved these changes
Aug 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of 2026.1 from upstream stable/2026.1.