Synchronise 2026.1 with upstream#18
Open
github-actions[bot] wants to merge 3 commits into
Open
Conversation
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)
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
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.