yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

storage: remove $running param from volume_snapshot

Browse Source 
not needed anymore after change in qemu-server

Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
This commit is contained in:
Alexandre Derumier
2025-07-16 08:31:53 +02:00
committed by Wolfgang Bumiller
parent 4ef8ab60f6
commit e17a33794c
10 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/PVE/Storage/ESXiPlugin.pm
View File

@ -561,7 +561,7 @@ sub volume_size_info {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
die "creating snapshots is not supported for $class\n";
}

2
src/PVE/Storage/ISCSIDirectPlugin.pm
View File

@ -232,7 +232,7 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
die "volume snapshot is not possible on iscsi device\n";
}

11
src/PVE/Storage/LVMPlugin.pm
View File

@ -959,21 +959,12 @@ sub volume_size_info {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
my ($vmid, $format) = ($class->parse_volname($volname))[2, 6];
die "can't snapshot '$format' volume\n" if $format ne 'qcow2';
if ($running) {
#rename with blockdev-reopen is done at qemu level when running
eval { alloc_snap_image($class, $storeid, $scfg, $volname, $snap) };
if ($@) {
die "can't allocate new volume $volname: $@\n";
}
return;
}
$class->activate_volume($storeid, $scfg, $volname);
#rename current volume to snap volume

2
src/PVE/Storage/LvmThinPlugin.pm
View File

@ -353,7 +353,7 @@ sub create_base {
# sub volume_resize {} reuse code from parent class
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
my $vg = $scfg->{vgname};
my $snapvol = "snap_${volname}_$snap";

2
src/PVE/Storage/PBSPlugin.pm
View File

@ -966,7 +966,7 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
die "volume snapshot is not possible on pbs device";
}

16
src/PVE/Storage/Plugin.pm
View File

@ -1272,7 +1272,7 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
if ($scfg->{'external-snapshots'}) {
@ -1280,18 +1280,14 @@ sub volume_snapshot {
my $vmid = ($class->parse_volname($volname))[2];
if (!$running) {
#rename volume unless qemu has already done it for us
$class->rename_snapshot($scfg, $storeid, $volname, 'current', $snap);
}
#rename volume unless qemu has already done it for us
$class->rename_snapshot($scfg, $storeid, $volname, 'current', $snap);
eval { alloc_backed_image($class, $storeid, $scfg, $volname, $snap) };
if ($@) {
warn "$@ \n";
#if running, the revert is done by qemu with blockdev-reopen
if (!$running) {
eval { $class->rename_snapshot($scfg, $storeid, $volname, $snap, 'current'); };
warn $@ if $@;
}
eval { $class->rename_snapshot($scfg, $storeid, $volname, $snap, 'current'); };
warn $@ if $@;
die "can't allocate new volume $volname with $snap backing image\n";
}

2
src/PVE/Storage/RBDPlugin.pm
View File

@ -868,7 +868,7 @@ sub volume_resize {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);

2
src/PVE/Storage/ZFSPoolPlugin.pm
View File

@ -480,7 +480,7 @@ sub volume_size_info {
}
sub volume_snapshot {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
my ($class, $scfg, $storeid, $volname, $snap) = @_;
my $vname = ($class->parse_volname($volname))[1];