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 6B2326676E for ; Fri, 6 Nov 2020 15:31:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 60F9B232E5 for ; Fri, 6 Nov 2020 15:31:09 +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 42D6A23295 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 0733D46061 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:56 +0100 Message-Id: <20201106143059.22047-2-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. [migrate.pm] Subject: [pve-devel] [PATCH v2 container 2/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:09 -0000 Every local volume is migrated via storage_migrate and activated there, so there is no need to do it in prepare() anymore. Signed-off-by: Fabian Ebner --- dependency bump needed I only found run_replication as a potential place that might need active local volumes, but that also uses storage_migrate in the end. src/PVE/LXC/Migrate.pm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index 90d74b4..94a78c5 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -45,7 +45,6 @@ sub prepare { $self->{was_running} = $running; my $force = $self->{opts}->{force} // 0; - my $need_activate = []; PVE::LXC::Config->foreach_volume($conf, sub { my ($ms, $mountpoint) = @_; @@ -80,9 +79,6 @@ sub prepare { warn "Used shared storage '$storage' is not online on source node!\n" if !$plugin->check_connection($storage, $scfg); } else { - # only activate if not shared - push @$need_activate, $volid; - # unless in restart mode because we shut the container down die "unable to migrate local mount point '$volid' while CT is running" if $running && !$restart; @@ -90,8 +86,6 @@ sub prepare { }); - PVE::Storage::activate_volumes($self->{storecfg}, $need_activate); - # todo: test if VM uses local resources # test ssh connection -- 2.20.1