From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 682F4667CE for ; Fri, 6 Nov 2020 15:31:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5F114232C1 for ; Fri, 6 Nov 2020 15:31:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 5E223232A9 for ; Fri, 6 Nov 2020 15:31:07 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2169246060 for ; Fri, 6 Nov 2020 15:31:07 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 6 Nov 2020 15:30:58 +0100 Message-Id: <20201106143059.22047-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201106143059.22047-1-f.ebner@proxmox.com> References: <20201106143059.22047-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.028 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemumigrate.pm] Subject: [pve-devel] [RFC v2 qemu-server 4/5] adapt to new storage_migrate activation behavior X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 14:31:38 -0000 Offline migrated volumes are now activated within storage_migrate. Online migrated volumes can be assumed to be already active. Signed-off-by: Fabian Ebner --- dependency bump needed Sent as RFC, because I'm not completly sure if this is fine here. Is the assumption about online volumes correct or is there some weird edge case I'm missing? I only found run_replication as a potential place that might need active local volumes, but that also uses storage_migrate in the end. PVE/QemuMigrate.pm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 2f4eec3..f2c2b07 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -251,7 +251,6 @@ sub prepare { my $vollist = PVE::QemuServer::get_vm_volumes($conf); - my $need_activate = []; foreach my $volid (@$vollist) { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1); @@ -266,16 +265,9 @@ sub prepare { my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); warn "Used shared storage '$sid' is not online on source node!\n" if !$plugin->check_connection($sid, $scfg); - } else { - # only activate if not shared - next if ($volid =~ m/vm-\d+-cloudinit/); - push @$need_activate, $volid; } } - # activate volumes - PVE::Storage::activate_volumes($self->{storecfg}, $need_activate); - # test ssh connection my $cmd = [ @{$self->{rem_ssh}}, '/bin/true' ]; eval { $self->cmd_quiet($cmd); }; -- 2.20.1