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

api: restore: better error messages

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-04-06 10:15:20 +02:00
parent a0e27afb5e
commit b973806ef1
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/API2/Qemu.pm
View File

@ -646,6 +646,7 @@ __PACKAGE__->register_method({
eval { PVE::QemuConfig->create_and_lock_config($vmid, $force) }; eval { PVE::QemuConfig->create_and_lock_config($vmid, $force) };
die "$emsg $@" if $@; die "$emsg $@" if $@;
my $restored_data = 0;
my $restorefn = sub { my $restorefn = sub {
my $conf = PVE::QemuConfig->load_config($vmid); my $conf = PVE::QemuConfig->load_config($vmid);
@ -662,13 +663,16 @@ __PACKAGE__->register_method({
live => $live_restore, live => $live_restore,
}; };
if ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') { if ($archive->{type} eq 'file' || $archive->{type} eq 'pipe') {
die "live-restore is only compatible with PBS\n" if $live_restore; die "live-restore is only compatible with backup images from a Proxmox Backup Server\n"
if $live_restore;
PVE::QemuServer::restore_file_archive($archive->{path} // '-', $vmid, $authuser, $restore_options); PVE::QemuServer::restore_file_archive($archive->{path} // '-', $vmid, $authuser, $restore_options);
} elsif ($archive->{type} eq 'pbs') { } elsif ($archive->{type} eq 'pbs') {
PVE::QemuServer::restore_proxmox_backup_archive($archive->{volid}, $vmid, $authuser, $restore_options); PVE::QemuServer::restore_proxmox_backup_archive($archive->{volid}, $vmid, $authuser, $restore_options);
} else { } else {
die "unknown backup archive type\n"; die "unknown backup archive type\n";
} }
$restored_data = 1;
my $restored_conf = PVE::QemuConfig->load_config($vmid); my $restored_conf = PVE::QemuConfig->load_config($vmid);
# Convert restored VM to template if backup was VM template # Convert restored VM to template if backup was VM template
if (PVE::QemuConfig->is_template($restored_conf)) { if (PVE::QemuConfig->is_template($restored_conf)) {
@ -757,6 +761,13 @@ __PACKAGE__->register_method({
if (my $err = $@) { if (my $err = $@) {
eval { PVE::QemuConfig->remove_lock($vmid, 'create') }; eval { PVE::QemuConfig->remove_lock($vmid, 'create') };
warn $@ if $@; warn $@ if $@;
if ($restored_data) {
warn "error after data was restored, VM disks should be OK but config may "
."require adaptions. VM $vmid state is NOT cleaned up.\n";
} else {
warn "error before or during data restore, some or all disks were not "
."completely restored. VM $vmid state is NOT cleaned up.\n";
}
die $err; die $err;
} }
}; };