proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-30 03:34:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backup: move cleanup of fleecing images to cleanup method

Browse Source 
TPM drives are already detached there and it's better to group
these things together.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-11-07 17:51:29 +01:00 committed by Fabian Grünbichler
parent 56aa940136
commit f270ebb198
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PVE/VZDump/QemuServer.pm
View File

@ -690,7 +690,6 @@ sub archive_pbs {
# get list early so we die on unkown drive types before doing anything # get list early so we die on unkown drive types before doing anything
my $devlist = _get_task_devlist($task); my $devlist = _get_task_devlist($task);
my $use_fleecing;
$self->enforce_vm_running_for_backup($vmid); $self->enforce_vm_running_for_backup($vmid);
$self->{qmeventd_fh} = PVE::QemuServer::register_qmeventd_handle($vmid); $self->{qmeventd_fh} = PVE::QemuServer::register_qmeventd_handle($vmid);
@ -721,7 +720,7 @@ sub archive_pbs {
my $is_template = PVE::QemuConfig->is_template($self->{vmlist}->{$vmid}); my $is_template = PVE::QemuConfig->is_template($self->{vmlist}->{$vmid});
$use_fleecing = check_and_prepare_fleecing( $task->{'use-fleecing'} = check_and_prepare_fleecing(
$self, $vmid, $opts->{fleecing}, $task->{disks}, $is_template, $qemu_support); $self, $vmid, $opts->{fleecing}, $task->{disks}, $is_template, $qemu_support);
my $fs_frozen = $self->qga_fs_freeze($task, $vmid); my $fs_frozen = $self->qga_fs_freeze($task, $vmid);
@ -735,7 +734,7 @@ sub archive_pbs {
devlist => $devlist, devlist => $devlist,
'config-file' => $conffile, 'config-file' => $conffile,
}; };
$params->{fleecing} = JSON::true if $use_fleecing; $params->{fleecing} = JSON::true if $task->{'use-fleecing'};
if (defined(my $ns = $scfg->{namespace})) { if (defined(my $ns = $scfg->{namespace})) {
$params->{'backup-ns'} = $ns; $params->{'backup-ns'} = $ns;
@ -784,11 +783,6 @@ sub archive_pbs {
} }
$self->restore_vm_power_state($vmid); $self->restore_vm_power_state($vmid);
if ($use_fleecing) {
detach_fleecing_images($task->{disks}, $vmid);
cleanup_fleecing_images($self, $task->{disks});
}
die $err if $err; die $err if $err;
} }
@ -891,7 +885,6 @@ sub archive_vma {
} }
my $devlist = _get_task_devlist($task); my $devlist = _get_task_devlist($task);
my $use_fleecing;
$self->enforce_vm_running_for_backup($vmid); $self->enforce_vm_running_for_backup($vmid);
$self->{qmeventd_fh} = PVE::QemuServer::register_qmeventd_handle($vmid); $self->{qmeventd_fh} = PVE::QemuServer::register_qmeventd_handle($vmid);
@ -911,7 +904,7 @@ sub archive_vma {
$attach_tpmstate_drive->($self, $task, $vmid); $attach_tpmstate_drive->($self, $task, $vmid);
$use_fleecing = check_and_prepare_fleecing( $task->{'use-fleecing'} = check_and_prepare_fleecing(
$self, $vmid, $opts->{fleecing}, $task->{disks}, $is_template, $qemu_support); $self, $vmid, $opts->{fleecing}, $task->{disks}, $is_template, $qemu_support);
my $outfh; my $outfh;
@ -942,7 +935,7 @@ sub archive_vma {
devlist => $devlist devlist => $devlist
}; };
$params->{'firewall-file'} = $firewall if -e $firewall; $params->{'firewall-file'} = $firewall if -e $firewall;
$params->{fleecing} = JSON::true if $use_fleecing; $params->{fleecing} = JSON::true if $task->{'use-fleecing'};
add_backup_performance_options($params, $opts->{performance}, $qemu_support); add_backup_performance_options($params, $opts->{performance}, $qemu_support);
$qmpclient->queue_cmd($vmid, $backup_cb, 'backup', %$params); $qmpclient->queue_cmd($vmid, $backup_cb, 'backup', %$params);
@ -984,11 +977,6 @@ sub archive_vma {
$self->restore_vm_power_state($vmid); $self->restore_vm_power_state($vmid);
if ($use_fleecing) {
detach_fleecing_images($task->{disks}, $vmid);
cleanup_fleecing_images($self, $task->{disks});
}
if ($err) { if ($err) {
if ($cpid) { if ($cpid) {
kill(9, $cpid); kill(9, $cpid);
@ -1132,6 +1120,11 @@ sub cleanup {
$detach_tpmstate_drive->($task, $vmid); $detach_tpmstate_drive->($task, $vmid);
if ($task->{'use-fleecing'}) {
detach_fleecing_images($task->{disks}, $vmid);
cleanup_fleecing_images($self, $task->{disks});
}
if ($self->{qmeventd_fh}) { if ($self->{qmeventd_fh}) {
close($self->{qmeventd_fh}); close($self->{qmeventd_fh});
} }