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 C5D1D69690 for ; Thu, 11 Mar 2021 10:22:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BADDB256F3 for ; Thu, 11 Mar 2021 10:22:13 +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 41EF2256D3 for ; Thu, 11 Mar 2021 10:22:13 +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 00717463A1 for ; Thu, 11 Mar 2021 10:22:13 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Mar 2021 10:22:05 +0100 Message-Id: <20210311092208.27221-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 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 Subject: [pve-devel] [PATCH v3 manager 1/4] vzdump: storage info: move out activate storage call 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: Thu, 11 Mar 2021 09:22:13 -0000 Otherwise storage_info() cannot be used for (at least) PBS storages from an API call without 'protected => 1', because the password cannot be read from '/etc/pve/priv'. Note that the function itself does not need the storage to be active, because it only uses storage_config() and get_backup_dir(). AFAICT new() is the only existing user of this function and can be responsible for activating the storage itself. Signed-off-by: Fabian Ebner --- New in v3 PVE/VZDump.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 02858d8e..fb4c8bad 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -106,8 +106,6 @@ sub storage_info { die "can't use storage '$storage' for backups - wrong content type\n" if (!$scfg->{content}->{backup}); - PVE::Storage::activate_storage($cfg, $storage); - my $info = { scfg => $scfg, }; @@ -505,6 +503,13 @@ sub new { my $errors = ''; if ($opts->{storage}) { + my $storage_cfg = PVE::Storage::config(); + eval { PVE::Storage::activate_storage($storage_cfg, $opts->{storage}) }; + if (my $err = $@) { + chomp($err); + $errors .= "could not activate storage '$opts->{storage}': $err"; + } + my $info = eval { storage_info ($opts->{storage}) }; if (my $err = $@) { chomp($err); -- 2.20.1