From f2c65e36fa4b34006459d335bc769ddcd45fe664 Mon Sep 17 00:00:00 2001
From: melanie witt <melwittt@gmail.com>
Date: Wed, 16 Apr 2025 15:20:23 -0700
Subject: [PATCH] libvirt: Use common naming convention for ephemeral disk
 labels

The _create_ephemeral() method is responsible for creating ephemeral
disks with image type "raw" and formatting them with mkfs. In the case
of [libvirt]images_type "qcow2", _create_ephemeral() will create
backing files.

Currently we are not using a consistent naming convention for choosing
the filesystem label for ephemeral disks. When we create a server for
example, we go through the disks and label them "ephemeral0",
"ephemeral1", "ephemeral2", etc.

When we hard reboot a server, there is a check to create missing
backing files and if so, a new backing file will be created but instead
of being labeled "ephemeralN" the code attempts to label them with the
name of the backing file itself for example "ephemeral_1_40d1d2c". This
will fail if the filesystem used for ephemeral disks has limitations on
the length of filesystem label names (VFAT, XFS, ...). For example:

  mkfs.vfat: Label can be no longer than 11 characters

This adds a helper method for obtaining ephemeral disks filesystem
label names and uses it the same way in the few places fs_label is
specified.

Closes-Bug: #2061701

Change-Id: Id033a5760272e4fb06dee2342414b26aa16ffe24
(cherry picked from commit 82856f95c69bb07bd2a61decae9abe827a2a1567)
(cherry picked from commit 09fc2fae424493ff9580c6d38e63f207b916529c)
(cherry picked from commit 2fd65bd14ac33b58e247bf9d3c8066fa5dac2215)
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
(cherry picked from commit d6cdd73c980b31080710f9a8cf10d7c779780c43)
(cherry picked from commit 911cc31b8cbbee9088a5c7b30ed34f3f2a327b3d)
(cherry picked from commit a8c53ef4c33e355b7e15251aeb862a42a434b8bf)
---
 nova/tests/unit/virt/libvirt/test_driver.py         |  5 ++++-
 nova/virt/libvirt/driver.py                         | 13 ++++++++++---
 ...01-ephemeral-disk-fs-label-504484c4522e6d6a.yaml |  6 ++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/bug-2061701-ephemeral-disk-fs-label-504484c4522e6d6a.yaml

diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
index bdb8bc18aa85..85ea8f0283f4 100644
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -13830,8 +13830,11 @@ class LibvirtConnTestCase(test.NoDBTestCase,
                              '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(
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 3353d712b392..da2da25ea9f8 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -4609,6 +4609,13 @@ class LibvirtDriver(driver.ComputeDriver):
                               {'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)
@@ -4715,7 +4722,7 @@ class LibvirtDriver(driver.ComputeDriver):
             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)
@@ -4739,7 +4746,7 @@ class LibvirtDriver(driver.ComputeDriver):
                 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)
@@ -10766,7 +10773,7 @@ class LibvirtDriver(driver.ComputeDriver):
                     # 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'],
diff --git a/releasenotes/notes/bug-2061701-ephemeral-disk-fs-label-504484c4522e6d6a.yaml b/releasenotes/notes/bug-2061701-ephemeral-disk-fs-label-504484c4522e6d6a.yaml
new file mode 100644
index 000000000000..5f4c22ca248a
--- /dev/null
+++ b/releasenotes/notes/bug-2061701-ephemeral-disk-fs-label-504484c4522e6d6a.yaml
@@ -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.