From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id CF8851FF138 for ; Wed, 04 Mar 2026 16:45:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3B945E1E4; Wed, 4 Mar 2026 16:46:27 +0100 (CET) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Subject: [RFC PATCH storage 1/2] nfs: create a helper to run rpcinfo commands Date: Wed, 4 Mar 2026 16:45:48 +0100 Message-ID: <20260304154551.503663-2-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260304154551.503663-1-m.sandoval@proxmox.com> References: <20260304154551.503663-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1772639126099 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.965 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.668 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.322 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 1.141 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 6FESR7MNFBQ77EEFOZKJ6FETJG5VZLDN X-Message-ID-Hash: 6FESR7MNFBQ77EEFOZKJ6FETJG5VZLDN X-MailFrom: m.sandoval@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Will be used in the next command as a fallback in the NFSv3 case. Signed-off-by: Maximiliano Sandoval --- src/PVE/Storage/NFSPlugin.pm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/PVE/Storage/NFSPlugin.pm b/src/PVE/Storage/NFSPlugin.pm index 4cc02c9e..062b3f32 100644 --- a/src/PVE/Storage/NFSPlugin.pm +++ b/src/PVE/Storage/NFSPlugin.pm @@ -171,6 +171,20 @@ sub deactivate_storage { } } +sub tcp_rpcinfo_cmd { + my ($server, $version) = @_; + + my $ip = PVE::JSONSchema::pve_verify_ip($server, 1); + if (!defined($ip)) { + $ip = PVE::Network::get_ip_from_hostname($server); + } + + my $transport = PVE::JSONSchema::pve_verify_ipv4($ip, 1) ? 'tcp' : 'tcp6'; + + # nfsv4 uses a pseudo-filesystem always beginning with / no exports are listed + return ['/usr/sbin/rpcinfo', '-T', $transport, $ip, 'nfs', $version]; +} + sub check_connection { my ($class, $storeid, $scfg) = @_; @@ -181,16 +195,7 @@ sub check_connection { my $is_v4 = defined($opts) && $opts =~ /vers=4.*/; if ($is_v4) { - my $ip = PVE::JSONSchema::pve_verify_ip($server, 1); - if (!defined($ip)) { - $ip = PVE::Network::get_ip_from_hostname($server); - } - - my $transport = PVE::JSONSchema::pve_verify_ipv4($ip, 1) ? 'tcp' : 'tcp6'; - - # nfsv4 uses a pseudo-filesystem always beginning with / - # no exports are listed - $cmd = ['/usr/sbin/rpcinfo', '-T', $transport, $ip, 'nfs', '4']; + $cmd = tcp_rpcinfo_cmd($server, '4'); } else { $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server]; } -- 2.47.3