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

live restore: start/delete blockdev jobs in deterministic order

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

6
PVE/QemuServer.pm
View File

@ -6416,7 +6416,7 @@ sub pbs_live_restore {
print "Starting VM for live-restore\n"; print "Starting VM for live-restore\n";
my $pbs_backing = {}; my $pbs_backing = {};
foreach my $ds (keys %$restored_disks) { for my $ds (keys %$restored_disks) {
$ds =~ m/^drive-(.*)$/; $ds =~ m/^drive-(.*)$/;
$pbs_backing->{$1} = { $pbs_backing->{$1} = {
repository => $repo, repository => $repo,
@ -6454,7 +6454,7 @@ sub pbs_live_restore {
# [target <- alloc-track -> PBS snapshot] to just [target] (alloc-track # [target <- alloc-track -> PBS snapshot] to just [target] (alloc-track
# removes itself once all backing images vanish with 'auto-remove=on') # removes itself once all backing images vanish with 'auto-remove=on')
my $jobs = {}; my $jobs = {};
foreach my $ds (keys %$restored_disks) { for my $ds (sort keys %$restored_disks) {
my $job_id = "restore-$ds"; my $job_id = "restore-$ds";
mon_cmd($vmid, 'block-stream', mon_cmd($vmid, 'block-stream',
'job-id' => $job_id, 'job-id' => $job_id,
@ -6467,7 +6467,7 @@ sub pbs_live_restore {
qemu_drive_mirror_monitor($vmid, undef, $jobs, 'auto', 0, 'stream'); qemu_drive_mirror_monitor($vmid, undef, $jobs, 'auto', 0, 'stream');
# all jobs finished, remove blockdevs now to disconnect from PBS # all jobs finished, remove blockdevs now to disconnect from PBS
foreach my $ds (keys %$restored_disks) { for my $ds (sort keys %$restored_disks) {
mon_cmd($vmid, 'blockdev-del', 'node-name' => "$ds-pbs"); mon_cmd($vmid, 'blockdev-del', 'node-name' => "$ds-pbs");
} }