--- Begin Message ---
allow to rename from|to external snapshot volname
Signed-off-by: Alexandre Derumier <alexandre.derum...@groupe-cyllene.com>
---
src/PVE/Storage.pm | 4 ++--
src/PVE/Storage/LVMPlugin.pm | 8 ++++++--
src/PVE/Storage/Plugin.pm | 5 ++++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm
index d0a696a..1a37cc8 100755
--- a/src/PVE/Storage.pm
+++ b/src/PVE/Storage.pm
@@ -2110,7 +2110,7 @@ sub complete_volume {
}
sub rename_volume {
- my ($cfg, $source_volid, $target_vmid, $target_volname) = @_;
+ my ($cfg, $source_volid, $target_vmid, $target_volname, $source_snap,
$target_snap) = @_;
die "no source volid provided\n" if !$source_volid;
die "no target VMID or target volname provided\n" if !$target_vmid &&
!$target_volname;
@@ -2125,7 +2125,7 @@ sub rename_volume {
$target_vmid = ($plugin->parse_volname($source_volname))[3] if
!$target_vmid;
return $plugin->cluster_lock_storage($storeid, $scfg->{shared}, undef, sub
{
- return $plugin->rename_volume($scfg, $storeid, $source_volname,
$target_vmid, $target_volname);
+ return $plugin->rename_volume($scfg, $storeid, $source_volname,
$target_vmid, $target_volname, $source_snap, $target_snap);
});
}
diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm
index 2ebec88..c4648ec 100644
--- a/src/PVE/Storage/LVMPlugin.pm
+++ b/src/PVE/Storage/LVMPlugin.pm
@@ -718,7 +718,7 @@ sub volume_import_write {
}
sub rename_volume {
- my ($class, $scfg, $storeid, $source_volname, $target_vmid,
$target_volname) = @_;
+ my ($class, $scfg, $storeid, $source_volname, $target_vmid,
$target_volname, $source_snap, $target_snap) = @_;
my (
undef,
@@ -729,6 +729,10 @@ sub rename_volume {
undef,
$format
) = $class->parse_volname($source_volname);
+
+ $source_image = $class->get_snap_volname($source_volname, $source_snap) if
$source_snap;
+ $target_volname = $class->get_snap_volname($source_volname, $target_snap)
if $target_snap;
+
$target_volname = $class->find_free_diskname($storeid, $scfg,
$target_vmid, $format)
if !$target_volname;
@@ -737,7 +741,7 @@ sub rename_volume {
die "target volume '${target_volname}' already exists\n"
if ($lvs->{$vg}->{$target_volname});
- lvrename($vg, $source_volname, $target_volname);
+ lvrename($vg, $source_image, $target_volname);
return "${storeid}:${target_volname}";
}
diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm
index 4e16420..85f761c 100644
--- a/src/PVE/Storage/Plugin.pm
+++ b/src/PVE/Storage/Plugin.pm
@@ -1846,7 +1846,7 @@ sub volume_import_formats {
}
sub rename_volume {
- my ($class, $scfg, $storeid, $source_volname, $target_vmid,
$target_volname) = @_;
+ my ($class, $scfg, $storeid, $source_volname, $target_vmid,
$target_volname, $source_snap, $target_snap) = @_;
die "not implemented in storage plugin '$class'\n" if $class->can('api')
&& $class->api() < 10;
die "no path found\n" if !$scfg->{path};
@@ -1860,6 +1860,9 @@ sub rename_volume {
$format
) = $class->parse_volname($source_volname);
+ $source_image = $class->get_snap_name($source_volname, $source_snap) if
$source_snap;
+ $target_volname = $class->get_snap_name($source_volname, $target_snap) if
$target_snap;
+
$target_volname = $class->find_free_diskname($storeid, $scfg,
$target_vmid, $format, 1)
if !$target_volname;
--
2.39.5
--- End Message ---
