Skip to content

Synchronise 2024.1 with upstream #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: stackhpc/2024.1
Choose a base branch
from
+20 −4
Open

Synchronise 2024.1 with upstream #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion nova/tests/unit/virt/libvirt/test_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14944,8 +14944,11 @@ def test_create_images_and_backing_ephemeral_gets_created(
'ephemeral_foo')
]

# This also asserts that the filesystem label name is generated
# correctly as 'ephemeral0' to help prevent regression of the
# related bug fix from https://launchpad.net/bugs/2061701
create_ephemeral_mock.assert_called_once_with(
ephemeral_size=1, fs_label='ephemeral_foo',
ephemeral_size=1, fs_label='ephemeral0',
os_type='linux', target=ephemeral_backing)

fetch_image_mock.assert_called_once_with(
Expand Down
13 changes: 10 additions & 3 deletions nova/virt/libvirt/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4948,6 +4948,13 @@ def _inject_data(self, disk, instance, injection_info):
{'img_id': img_id, 'e': e},
instance=instance)

@staticmethod
def _get_fs_label_ephemeral(index: int) -> str:
# Use a consistent naming convention for FS labels. We need to be
# mindful of various filesystems label name length limitations.
# See for example: https://bugs.launchpad.net/nova/+bug/2061701
return f'ephemeral{index}'

# NOTE(sileht): many callers of this method assume that this
# method doesn't fail if an image already exists but instead
# think that it will be reused (ie: (live)-migration/resize)
Expand Down Expand Up @@ -5063,7 +5070,7 @@ def raw(fname, disk_info_mapping=None):
created_disks = created_disks or not disk_image.exists()

fn = functools.partial(self._create_ephemeral,
fs_label='ephemeral0',
fs_label=self._get_fs_label_ephemeral(0),
os_type=instance.os_type,
is_block_dev=disk_image.is_block_dev,
vm_mode=vm_mode)
Expand All @@ -5089,7 +5096,7 @@ def raw(fname, disk_info_mapping=None):
raise exception.InvalidBDMFormat(details=msg)

fn = functools.partial(self._create_ephemeral,
fs_label='ephemeral%d' % idx,
fs_label=self._get_fs_label_ephemeral(idx),
os_type=instance.os_type,
is_block_dev=disk_image.is_block_dev,
vm_mode=vm_mode)
Expand Down Expand Up @@ -11511,7 +11518,7 @@ def _create_images_and_backing(self, context, instance, instance_dir,
# cached.
disk.cache(
fetch_func=self._create_ephemeral,
fs_label=cache_name,
fs_label=self._get_fs_label_ephemeral(0),
os_type=instance.os_type,
filename=cache_name,
size=info['virt_disk_size'],
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/bug-2061701-ephemeral-disk-fs-label-504484c4522e6d6a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fixes:
- |
Fixed an issue where certain server actions could fail for servers with
ephemeral disks due to filesystem label name length limitations
(VFAT, XFS, ...). Filesystem label name generation has been fixed for these
cases. See https://launchpad.net/bugs/2061701 for more details.
Loading