Synchronise 2025.1 with upstream - #229
Open
github-actions[bot] wants to merge 3 commits into
Open
Conversation
The websocket proxy mutates the CONF host list with the Host header from the request, which would then poison future requests and/or lead to a slow resource exhaustion attack. Simply making a copy before mutation avoids the issue. Conflicts: nova/console/websocketproxy.py Generated-By: Claude Opus 4.6 Closes-Bug: #2158919 Change-Id: Ib13e479337f9b1c8b16952089d1d5f6979976b86 Signed-off-by: Dan Smith <dansmith@redhat.com> (cherry picked from commit 0612fed) (cherry picked from commit e488194) (cherry picked from commit 5fe20b9)
Currently the CPU time and address space process limits for qemu-img
are hard-coded to 30 seconds and 1G respectively.
With more recent versions of Ceph in upstream CI, we have experienced
test failures that suggest 1G is no longer large enough for encrypted
RBD images. In the failures the following error is raised:
nova.exception.InvalidDiskInfo: Disk info file is invalid: qemu-img
failed to execute on
rbd:volumes/volume-c83c9b7f-0f38-4bb8-a40a-300a66080d21:id=cinder :
Unexpected error while running command.
Command: /opt/stack/data/venv/bin/python3.12 -m
oslo_concurrency.prlimit --as=1073741824 --cpu=30 -- env LC_ALL=C
LANG=C qemu-img info
rbd:volumes/volume-c83c9b7f-0f38-4bb8-a40a-300a66080d21:id=cinder
--force-share --output=json
Exit code: -6
Stdout: ''
Stderr: 'failed to allocate memory for stack: Cannot allocate memory\n'
This adds config options ``images_cpu_time_limit`` and
``images_address_space_limit`` to the ``[libvirt]`` section to allow
for tuning of the qemu-img process limits, similar to how Cinder and
Ironic make qemu-img process limits configurable.
Stable Only Changes
- the defautl value is updated to 1G to maintain stable
branch behavior
- the ci jobs are updated to use 2G to match master
- the release note is updated to reflect this.
Closes-Bug: #2116852
Change-Id: I10e53de27b063b1e514e04066d0eb56a86188e9a
Signed-off-by: melanie witt <melwittt@gmail.com>
Signed-off-by: Sean Mooney <work@seanmooney.info>
(cherry picked from commit 7f43431)
(cherry picked from commit 8595b8e)
(cherry picked from commit 7a1a8a2)
github-actions
Bot
added
automated
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
2 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 2025.1 from upstream stable/2025.1.