[lxc-devel] [lxd/master] lxd/storage/lvm: Use right VG name for exports

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 370 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190203/4a10be48/attachment.bin>
-------------- next part --------------
From d87a9bc643059e66caa06fbf85431f969ac628b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sun, 3 Feb 2019 11:12:42 +0100
Subject: [PATCH] lxd/storage/lvm: Use right VG name for exports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #5457

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/storage_lvm.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lxd/storage_lvm.go b/lxd/storage_lvm.go
index b2df2b938d..91b1f9f413 100644
--- a/lxd/storage_lvm.go
+++ b/lxd/storage_lvm.go
@@ -1673,6 +1673,8 @@ func (s *storageLvm) ContainerSnapshotCreateEmpty(snapshotContainer container) e
 }
 
 func (s *storageLvm) ContainerBackupCreate(backup backup, source container) error {
+	poolName := s.getOnDiskPoolName()
+
 	// Start storage
 	ourStart, err := source.StorageStart()
 	if err != nil {
@@ -1748,13 +1750,13 @@ func (s *storageLvm) ContainerBackupCreate(backup backup, source container) erro
 	}
 	defer os.RemoveAll(tmpContainerMntPoint)
 
-	_, err = s.createSnapshotLV(source.Project(), s.pool.Name, source.Name(),
+	_, err = s.createSnapshotLV(source.Project(), poolName, source.Name(),
 		storagePoolVolumeAPIEndpointContainers, containerNameToLVName(sourceLvmDatasetSnapshot),
 		storagePoolVolumeAPIEndpointContainers, false, s.useThinpool)
 	if err != nil {
 		return err
 	}
-	defer removeLV(source.Project(), s.pool.Name, storagePoolVolumeAPIEndpointContainers,
+	defer removeLV(source.Project(), poolName, storagePoolVolumeAPIEndpointContainers,
 		containerNameToLVName(sourceLvmDatasetSnapshot))
 
 	// Mount the temporary snapshot