From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 530451FF15F for ; Mon, 26 Aug 2024 13:01:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 451231134A; Mon, 26 Aug 2024 13:00:49 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Mon, 26 Aug 2024 13:00:27 +0200 In-Reply-To: <20240826110030.1744732-1-alexandre.derumier@groupe-cyllene.com> References: <20240826110030.1744732-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Alexandre Derumier via pve-devel Precedence: list Cc: Alexandre Derumier X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH qemu-server 4/6] migration: refresh remote disk size before resume Content-Type: multipart/mixed; boundary="===============4111484342904463687==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============4111484342904463687== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: 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 6E820C6930 for ; Mon, 26 Aug 2024 13:00:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 022E410E2C for ; Mon, 26 Aug 2024 13:00:45 +0200 (CEST) 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 ; Mon, 26 Aug 2024 13:00:42 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 4C14C81F57A; Mon, 26 Aug 2024 13:00:33 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 1E9C1102034B; Mon, 26 Aug 2024 13:00:32 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 4/6] migration: refresh remote disk size before resume Date: Mon, 26 Aug 2024 13:00:27 +0200 Message-Id: <20240826110030.1744732-10-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240826110030.1744732-1-alexandre.derumier@groupe-cyllene.com> References: <20240826110030.1744732-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.053 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.249 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 T_SCC_BODY_TEXT_LINE -0.01 - A blockextend occur on source just before the switch. we want to be sure that lvm size on target is correctly refreshed, or we could have io-error is the vm is writing to non available sectors Signed-off-by: Alexandre Derumier --- PVE/CLI/qm.pm | 26 ++++++++++++++++++++++++++ PVE/QemuMigrate.pm | 13 +++++++++++++ test/MigrationTest/QemuMigrateMock.pm | 2 ++ 3 files changed, 41 insertions(+) diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm index 1410ad5..6e258f3 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -553,6 +553,30 @@ __PACKAGE__->register_method ({ return; }}); +__PACKAGE__->register_method ({ + name => 'refresh', + path => 'refresh', + method => 'POST', + description => "Force storage volume size cache refresh.", + parameters => { + additionalProperties => 0, + properties => { + vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), + }, + }, + returns => { type => 'null'}, + code => sub { + my ($param) = @_; + + my $vmid = extract_param($param, 'vmid'); + my $conf = PVE::QemuConfig->load_config($vmid); + my $storecfg = PVE::Storage::config(); + my $vols = PVE::QemuServer::get_vm_volumes($conf); + PVE::Storage::refresh_volumes($storecfg, $vols); + + return; + }}); + __PACKAGE__->register_method ({ name => 'importdisk', path => 'importdisk', @@ -1192,6 +1216,7 @@ our $cmddef = { 'move-disk' => { alias => 'disk move' }, move_disk => { alias => 'disk move' }, rescan => { alias => 'disk rescan' }, + refresh => { alias => 'disk refresh' }, resize => { alias => 'disk resize' }, unlink => { alias => 'disk unlink' }, @@ -1202,6 +1227,7 @@ our $cmddef = { resize => [ "PVE::API2::Qemu", 'resize_vm', ['vmid', 'disk', 'size'], { %node } ], unlink => [ "PVE::API2::Qemu", 'unlink', ['vmid'], { %node } ], blockextend => [ __PACKAGE__, 'blockextend', ['vmid', 'disk'], { %node }], + refresh => [ __PACKAGE__, 'refresh', ['vmid']], }, monitor => [ __PACKAGE__, 'monitor', ['vmid']], diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index bdcc2e5..9ae9ea1 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -1503,6 +1503,19 @@ sub phase3_cleanup { PVE::QemuServer::del_nets_bridge_fdb($conf, $vmid); if (!$self->{vm_was_paused}) { + + # refresh remote volumes size if extend have occured + my $cmd = [@{$self->{rem_ssh}}, 'qm', 'disk', 'refresh', $vmid]; + my $logf = sub { + my $line = shift; + $self->log('err', $line); + }; + eval { PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => $logf); }; + if (my $err = $@) { + $self->log('err', $err); + $self->{errors} = 1; + } + # config moved and nbd server stopped - now we can resume vm on target if ($tunnel && $tunnel->{version} && $tunnel->{version} >= 1) { my $cmd = $tunnel->{version} == 1 ? "resume $vmid" : "resume"; diff --git a/test/MigrationTest/QemuMigrateMock.pm b/test/MigrationTest/QemuMigrateMock.pm index 1efabe2..0057868 100644 --- a/test/MigrationTest/QemuMigrateMock.pm +++ b/test/MigrationTest/QemuMigrateMock.pm @@ -306,6 +306,8 @@ $MigrationTest::Shared::tools_module->mock( return 0; } elsif ($cmd eq 'resume') { return 0; + } elsif ($cmd eq 'disk') { + return 0; } elsif ($cmd eq 'unlock') { my $vmid = shift @{$cmd_tail};; die "unlocking wrong vmid: $vmid\n" if $vmid ne $test_vmid; -- 2.39.2 --===============4111484342904463687== 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 --===============4111484342904463687==--