[lxc-devel] [lxd/master] lxd/storage/ceph: Only rewrite UUID once

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190507/ba1bb31d/attachment-0001.bin>
-------------- next part --------------
From d6c693be5a5ad0baae947c0590f40e4f1312c32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 7 May 2019 14:37:26 -0400
Subject: [PATCH] lxd/storage/ceph: Only rewrite UUID once
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/storage_ceph.go       | 6 ------
 lxd/storage_ceph_utils.go | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lxd/storage_ceph.go b/lxd/storage_ceph.go
index 61563d3aa8..f90c9ba304 100644
--- a/lxd/storage_ceph.go
+++ b/lxd/storage_ceph.go
@@ -1159,12 +1159,6 @@ func (s *storageCeph) ContainerCopy(target container, source container,
 			return err
 		}
 
-		// Re-generate the UUID
-		err := s.cephRBDGenerateUUID(projectPrefix(target.Project(), target.Name()), storagePoolVolumeTypeNameContainer)
-		if err != nil {
-			return err
-		}
-
 		logger.Debugf(`Copied RBD container storage %s to %s`,
 			sourceContainerName, target.Name())
 		return nil
diff --git a/lxd/storage_ceph_utils.go b/lxd/storage_ceph_utils.go
index abe9bdc4af..4f6889af9b 100644
--- a/lxd/storage_ceph_utils.go
+++ b/lxd/storage_ceph_utils.go
@@ -740,6 +740,13 @@ func (s *storageCeph) copyWithoutSnapshotsFull(target container,
 		return err
 	}
 
+	// Re-generate the UUID
+	err = s.cephRBDGenerateUUID(projectPrefix(target.Project(), target.Name()), storagePoolVolumeTypeNameContainer)
+	if err != nil {
+		return err
+	}
+
+	// Create mountpoint
 	targetContainerMountPoint := getContainerMountPoint(target.Project(), s.pool.Name, target.Name())
 	err = createContainerMountpoint(targetContainerMountPoint, target.Path(), target.IsPrivileged())
 	if err != nil {