Merge pull request #15 from flyingcircusio/PL-133015-uuid-regen-only-…

…during-bootstrap Only regenerate XFS UUID during bootstrap.
flyingcircusio · Sep 26, 2024 · 2723864 · 2723864
2 parents 1e8de38 + b5ec86b
commit 2723864
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,7 +4,7 @@ Release notes
 1.4.5 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Only regenerate XFS UUIDs when bootstrapping a VM.
 
 
 1.4.4 (2024-08-18)

diff --git a/src/fc/qemu/hazmat/ceph.py b/src/fc/qemu/hazmat/ceph.py
@@ -13,7 +13,6 @@
 
 
 class Ceph(object):
-
     # Attributes on this class can be overriden in a controlled fashion
     # from the sysconfig module. See __init__(). The defaults are here to
     # support testing.
@@ -73,8 +72,8 @@ def ensure_root_volume(self):
         if not self.root.exists():
             self.log.info("create-vm")
             cmd(self.CREATE_VM.format(**self.cfg), self.log)
+            self.root.regen_xfs_uuid()
         self.root.lock()
-        self.root.regen_xfs_uuid()
 
     def ensure_swap_volume(self):
         self.log.info("ensure-swap")

diff --git a/src/fc/qemu/tests/vm_test.py b/src/fc/qemu/tests/vm_test.py
@@ -81,7 +81,6 @@ def test_simple_vm_lifecycle_start_stop(vm):
 fc-create-vm> Finished
 fc-create-vm> --------
 /nix/store/.../bin/fc-create-vm machine=simplevm returncode=0 subsystem=ceph
-lock machine=simplevm subsystem=ceph volume=rbd.ssd/simplevm.root
 rbd args=-c "/etc/ceph/ceph.conf" --id "host1" map "rbd.ssd/simplevm.root" machine=simplevm subsystem=ceph volume=rbd.ssd/simplevm.root
 rbd> /dev/rbd0
 rbd machine=simplevm returncode=0 subsystem=ceph volume=rbd.ssd/simplevm.root
@@ -106,6 +105,7 @@ def test_simple_vm_lifecycle_start_stop(vm):
 xfs_admin machine=simplevm returncode=0 subsystem=ceph volume=rbd.ssd/simplevm.root
 rbd args=-c "/etc/ceph/ceph.conf" --id "host1" unmap "/dev/rbd/rbd.ssd/simplevm.root" machine=simplevm subsystem=ceph volume=rbd.ssd/simplevm.root
 rbd machine=simplevm returncode=0 subsystem=ceph volume=rbd.ssd/simplevm.root
+lock machine=simplevm subsystem=ceph volume=rbd.ssd/simplevm.root
 ensure-tmp machine=simplevm subsystem=ceph
 lock machine=simplevm subsystem=ceph volume=rbd.ssd/simplevm.tmp
 rbd args=-c "/etc/ceph/ceph.conf" --id "host1" map "rbd.ssd/simplevm.tmp" machine=simplevm subsystem=ceph volume=rbd.ssd/simplevm.tmp