[lxc-devel] [lxd/master] lxd/storage/zfs: Fix dataset handling on copy

[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/20181215/50a45730/attachment.bin>
-------------- next part --------------
From 3e882b135febdfce8cab493846cb0f8998113a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 14 Dec 2018 19:05:05 -0500
Subject: [PATCH] lxd/storage/zfs: Fix dataset handling on copy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #5359

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

diff --git a/lxd/storage_zfs.go b/lxd/storage_zfs.go
index ac8757f654..76b347a9d4 100644
--- a/lxd/storage_zfs.go
+++ b/lxd/storage_zfs.go
@@ -3101,7 +3101,7 @@ func (s *storageZfs) copyVolumeWithoutSnapshotsSparse(source *api.StorageVolumeS
 	sourceVolumePath := getStoragePoolVolumeMountPoint(source.Pool, source.Name)
 
 	targetVolumeName := s.volume.Name
-	targetVolumePath := getStoragePoolVolumeMountPoint(poolName, s.volume.Name)
+	targetVolumePath := getStoragePoolVolumeMountPoint(s.pool.Name, s.volume.Name)
 
 	sourceZfsDataset := ""
 	sourceZfsDatasetSnapshot := ""
@@ -3169,7 +3169,6 @@ func (s *storageZfs) StoragePoolVolumeCopy(source *api.StorageVolumeSource) erro
 	successMsg := fmt.Sprintf("Copied ZFS storage volume \"%s\" on storage pool \"%s\" as \"%s\" to storage pool \"%s\"", source.Name, source.Pool, s.volume.Name, s.pool.Name)
 
 	if source.Pool != s.pool.Name {
-		logger.Errorf("wtf")
 		return s.doCrossPoolStorageVolumeCopy(source)
 	}