--- Begin Message ---
FIXME:
   port qemu bitmap drive-mirror patch to blockdev-mirror

Signed-off-by: Alexandre Derumier <alexandre.derum...@groupe-cyllene.com>
---
 PVE/QemuMigrate.pm                    |  2 +-
 PVE/QemuServer.pm                     | 61 ++++++++++++++++-----------
 test/MigrationTest/QemuMigrateMock.pm | 10 +++--
 3 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index b7bf2aa3..6edbfbef 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -1149,7 +1149,7 @@ sub phase2 {
            my $bitmap = $target->{bitmap};
 
            $self->log('info', "$drive: start migration to $nbd_uri");
-           PVE::QemuServer::qemu_drive_mirror($vmid, $drive, $nbd_uri, $vmid, 
undef, $self->{storage_migration_jobs}, 'skip', undef, $bwlimit, $bitmap);
+           PVE::QemuServer::qemu_drive_mirror($vmid, $source_drive, $nbd_uri, 
$vmid, undef, $self->{storage_migration_jobs}, 'skip', undef, $bwlimit, 
$bitmap);
        }
 
        if (PVE::QemuServer::QMPHelpers::runs_at_least_qemu_version($vmid, 8, 
2)) {
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 783f58c3..ffe60ead 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -7958,57 +7958,70 @@ sub qemu_img_convert {
 sub qemu_drive_mirror {
     my ($vmid, $drive, $dst_volid, $vmiddst, $is_zero_initialized, $jobs, 
$completion, $qga, $bwlimit, $src_bitmap) = @_;
 
-    $jobs = {} if !$jobs;
+    my $storecfg = PVE::Storage::config();
 
-    my $qemu_target;
-    my $format;
-    $jobs->{"drive-$drive"} = {};
+    # copy original drive config (aio,cache,discard,...)
+    my $dst_drive = dclone($drive);
+    $dst_drive->{file} = $dst_volid;
+    $dst_drive->{zeroinit} = 1 if $is_zero_initialized;
+    #improve: if target storage don't support aio uring,change it to default 
native
+    #and remove clone_disk_check_io_uring()
 
-    if ($dst_volid =~ /^nbd:/) {
-       $qemu_target = $dst_volid;
-       $format = "nbd";
-    } else {
-       my $storecfg = PVE::Storage::config();
+    #add new block device
+    my $target_drive_blockdev = generate_drive_blockdev($storecfg, $dst_drive);
+    my $target_blockdev = $target_drive_blockdev->{file};  #can be fmt or only 
file for nbd
+    PVE::QemuServer::Monitor::mon_cmd($vmid, 'blockdev-add', 
%$target_blockdev);
+    my $target_nodename = $target_blockdev->{'node-name'};
 
-       $format = checked_volume_format($storecfg, $dst_volid);
+    # we replace the original src_fmt node in the blockdev graph.
+    # need to be defined, or if not, it'll replace the root throttle-filter
+    my $src_drive_blockdev = generate_drive_blockdev($storecfg, $drive);
+    my $src_fmt_nodename = $src_drive_blockdev->{file}->{'node-name'};
 
-       my $dst_path = PVE::Storage::path($storecfg, $dst_volid);
 
-       $qemu_target = $is_zero_initialized ? "zeroinit:$dst_path" : $dst_path;
-    }
+    my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive);
+    my $deviceid = "drive-$drive_id";
+
+    $jobs = {} if !$jobs;
+    my $jobid = "mirror-$deviceid";
+    $jobs->{$jobid} = {};
 
     my $opts = {
+       'job-id' => $jobid,
        timeout => 10,
-       device => "drive-$drive",
-       mode => "existing",
+       device => $deviceid,
+       replaces => $src_fmt_nodename,
        sync => "full",
-       target => $qemu_target,
+       target => $target_nodename,
        'auto-dismiss' => JSON::false,
     };
-    $opts->{format} = $format if $format;
 
     if (defined($src_bitmap)) {
        $opts->{sync} = 'incremental';
-       $opts->{bitmap} = $src_bitmap;
+       $opts->{bitmap} = $src_bitmap;   ##FIXME: port qemu bitmap drive-mirror 
patch to blockdev-mirror
        print "drive mirror re-using dirty bitmap '$src_bitmap'\n";
     }
 
     if (defined($bwlimit)) {
        $opts->{speed} = $bwlimit * 1024;
-       print "drive mirror is starting for drive-$drive with bandwidth limit: 
${bwlimit} KB/s\n";
+       print "drive mirror is starting for $deviceid with bandwidth limit: 
${bwlimit} KB/s\n";
     } else {
-       print "drive mirror is starting for drive-$drive\n";
+       print "drive mirror is starting for $deviceid\n";
     }
 
     # if a job already runs for this device we get an error, catch it for 
cleanup
-    eval { mon_cmd($vmid, "drive-mirror", %$opts); };
+    eval { mon_cmd($vmid, "blockdev-mirror", %$opts); };
+
     if (my $err = $@) {
        eval { PVE::QemuServer::qemu_blockjobs_cancel($vmid, $jobs) };
        warn "$@\n" if $@;
+       eval { mon_cmd($vmid, 'blockdev-del', 'node-name' => 
$target_blockdev->{file}->{'node-name'}) };
+       warn "$@\n" if $@;
+       eval { mon_cmd($vmid, 'blockdev-del', 'node-name' => $target_nodename) 
};
+       warn "$@\n" if $@;
        die "mirroring error: $err\n";
     }
-
-    qemu_drive_mirror_monitor ($vmid, $vmiddst, $jobs, $completion, $qga);
+    qemu_drive_mirror_monitor ($vmid, $vmiddst, $jobs, $completion, $qga, 
'mirror');
 }
 
 # $completion can be either
@@ -8367,7 +8380,7 @@ sub clone_disk {
 
        my $sparseinit = PVE::Storage::volume_has_feature($storecfg, 
'sparseinit', $newvolid);
        if ($use_drive_mirror) {
-           qemu_drive_mirror($vmid, $src_drivename, $newvolid, $newvmid, 
$sparseinit, $jobs,
+           qemu_drive_mirror($vmid, $drive, $newvolid, $newvmid, $sparseinit, 
$jobs,
                $completion, $qga, $bwlimit);
        } else {
            if ($dst_drivename eq 'efidisk0') {
diff --git a/test/MigrationTest/QemuMigrateMock.pm 
b/test/MigrationTest/QemuMigrateMock.pm
index 11c58c08..d156ff1b 100644
--- a/test/MigrationTest/QemuMigrateMock.pm
+++ b/test/MigrationTest/QemuMigrateMock.pm
@@ -132,14 +132,16 @@ $MigrationTest::Shared::qemu_server_module->mock(
     qemu_drive_mirror => sub {
        my ($vmid, $drive, $dst_volid, $vmiddst, $is_zero_initialized, $jobs, 
$completion, $qga, $bwlimit, $src_bitmap) = @_;
 
+       my $drive_id = "$drive->{interface}$drive->{index}";
+
        die "drive_mirror with wrong vmid: '$vmid'\n" if $vmid ne $test_vmid;
-       die "qemu_drive_mirror '$drive' error\n"
-           if $fail_config->{qemu_drive_mirror} && 
$fail_config->{qemu_drive_mirror} eq $drive;
+       die "qemu_drive_mirror '$drive_id' error\n"
+           if $fail_config->{qemu_drive_mirror} && 
$fail_config->{qemu_drive_mirror} eq $drive_id;
 
        my $nbd_info = 
decode_json(file_get_contents("${RUN_DIR_PATH}/nbd_info"));
        die "target does not expect drive mirror for '$drive'\n"
-           if !defined($nbd_info->{$drive});
-       delete $nbd_info->{$drive};
+           if !defined($nbd_info->{$drive_id});
+       delete $nbd_info->{$drive_id};
        file_set_contents("${RUN_DIR_PATH}/nbd_info", to_json($nbd_info));
     },
     qemu_drive_mirror_monitor => sub {
-- 
2.39.5



--- End Message ---
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Reply via email to