From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 248371FF15E for <inbox@lore.proxmox.com>; Tue, 11 Mar 2025 11:32:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B206CBB5; Tue, 11 Mar 2025 11:30:00 +0100 (CET) To: pve-devel@lists.proxmox.com Date: Tue, 11 Mar 2025 11:29:02 +0100 In-Reply-To: <20250311102905.2680524-1-alexandre.derumier@groupe-cyllene.com> References: <20250311102905.2680524-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: <mailman.964.1741688999.293.pve-devel@lists.proxmox.com> List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Post: <mailto:pve-devel@lists.proxmox.com> From: Alexandre Derumier via pve-devel <pve-devel@lists.proxmox.com> Precedence: list Cc: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> Subject: [pve-devel] [PATCH v4 qemu-server 08/11] blockdev: convert drive_mirror to blockdev_mirror Content-Type: multipart/mixed; boundary="===============0255555862868213816==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> --===============0255555862868213816== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: <root@formationkvm1.odiso.net> X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9093AD5908 for <pve-devel@lists.proxmox.com>; Tue, 11 Mar 2025 11:29:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3F717C599 for <pve-devel@lists.proxmox.com>; Tue, 11 Mar 2025 11:29:26 +0100 (CET) Received: from bastiontest.odiso.net (unknown [IPv6:2a0a:1580:2000:6700::14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for <pve-devel@lists.proxmox.com>; Tue, 11 Mar 2025 11:29:20 +0100 (CET) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 3979E862E45; Tue, 11 Mar 2025 11:29:09 +0100 (CET) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 8AE78119292E; Tue, 11 Mar 2025 11:29:09 +0100 (CET) From: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> To: pve-devel@lists.proxmox.com Subject: [PATCH v4 qemu-server 08/11] blockdev: convert drive_mirror to blockdev_mirror Date: Tue, 11 Mar 2025 11:29:02 +0100 Message-Id: <20250311102905.2680524-15-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311102905.2680524-1-alexandre.derumier@groupe-cyllene.com> References: <20250311102905.2680524-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.115 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> --- PVE/QemuMigrate.pm | 2 +- PVE/QemuServer.pm | 65 ++++++++++++++++++--------- test/MigrationTest/QemuMigrateMock.pm | 10 +++-- 3 files changed, 50 insertions(+), 27 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index ed5ede30..09402311 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -1134,7 +1134,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 a9c8b758..63b8f332 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7729,57 +7729,78 @@ 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(); + + # 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() - my $qemu_target; - my $format; - $jobs->{"drive-$drive"} = {}; + #add new block device + my $target_file_blockdev = generate_file_blockdev($storecfg, $dst_drive); + my $target_fmt_blockdev = undef; + my $target_nodename = undef; if ($dst_volid =~ /^nbd:/) { - $qemu_target = $dst_volid; - $format = "nbd"; + #nbd file don't have fmt + $target_nodename = encode_nodename('file', $dst_volid); + PVE::QemuServer::Monitor::mon_cmd($vmid, 'blockdev-add', %$target_file_blockdev); } else { - my $storecfg = PVE::Storage::config(); + $target_nodename = encode_nodename('fmt', $dst_volid); + $target_fmt_blockdev = generate_format_blockdev($storecfg, $dst_drive, $target_file_blockdev); + PVE::QemuServer::Monitor::mon_cmd($vmid, 'blockdev-add', %$target_fmt_blockdev); + } - $format = checked_volume_format($storecfg, $dst_volid); + # we replace the original src_fmt node in the blockdev graph. + # need to be fined, or it'll replace the root throttle-filter + my $src_fmt_nodename = encode_nodename('fmt', $drive->{file}); - my $dst_path = PVE::Storage::path($storecfg, $dst_volid); - $qemu_target = $is_zero_initialized ? "zeroinit:$dst_path" : $dst_path; - } + my $drive_id = 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: how to handle bitmap ? special proxmox patch ? 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_file_blockdev->{'node-name'}) }; + warn "$@\n" if $@; + eval { mon_cmd($vmid, 'blockdev-del', 'node-name' => $target_fmt_blockdev->{'node-name'}) }; + 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 @@ -8111,7 +8132,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 --===============0255555862868213816== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============0255555862868213816==--