From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 8BB071FF2C8
for <inbox@lore.proxmox.com>; Wed, 17 Jul 2024 11:42:58 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7762938917;
Wed, 17 Jul 2024 11:42:50 +0200 (CEST)
From: Max Carrara <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 17 Jul 2024 11:40:24 +0200
Message-Id: <20240717094034.124857-27-m.carrara@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240717094034.124857-1-m.carrara@proxmox.com>
References: <20240717094034.124857-1-m.carrara@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.030 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
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] [RFC pve-storage 26/36] plugin: gluster: make helper
subroutines private
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
.. and also use a regular sub definition for `get_active_server` in
order to avoid the sub prefix deref syntax when calling it.
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
---
src/PVE/Storage/GlusterfsPlugin.pm | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/PVE/Storage/GlusterfsPlugin.pm b/src/PVE/Storage/GlusterfsPlugin.pm
index 2b7f9e1..634a090 100644
--- a/src/PVE/Storage/GlusterfsPlugin.pm
+++ b/src/PVE/Storage/GlusterfsPlugin.pm
@@ -16,7 +16,7 @@ use base qw(PVE::Storage::Plugin);
my $server_test_results = {};
-my $get_active_server = sub {
+my sub get_active_server {
my ($scfg, $return_default_if_offline) = @_;
my $defaultserver = $scfg->{server} ? $scfg->{server} : 'localhost';
@@ -66,7 +66,7 @@ my $get_active_server = sub {
return undef;
};
-sub glusterfs_is_mounted {
+my sub glusterfs_is_mounted {
my ($volume, $mountpoint, $mountdata) = @_;
$mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
@@ -79,7 +79,7 @@ sub glusterfs_is_mounted {
return undef;
}
-sub glusterfs_mount {
+my sub glusterfs_mount {
my ($server, $volume, $mountpoint) = @_;
my $source = "$server:$volume";
@@ -179,7 +179,7 @@ sub path {
my $path = undef;
if ($vtype eq 'images') {
- my $server = &$get_active_server($scfg, 1);
+ my $server = get_active_server($scfg, 1);
my $glustervolume = $scfg->{volume};
my $transport = $scfg->{transport};
my $protocol = "gluster";
@@ -227,7 +227,7 @@ sub clone_image {
die "disk image '$path' already exists\n" if -e $path;
- my $server = &$get_active_server($scfg, 1);
+ my $server = get_active_server($scfg, 1);
my $glustervolume = $scfg->{volume};
my $volumepath = "gluster://$server/$glustervolume/images/$vmid/$name";
@@ -258,7 +258,7 @@ sub alloc_image {
die "disk image '$path' already exists\n" if -e $path;
- my $server = &$get_active_server($scfg, 1);
+ my $server = get_active_server($scfg, 1);
my $glustervolume = $scfg->{volume};
my $volumepath = "gluster://$server/$glustervolume/images/$vmid/$name";
@@ -309,7 +309,7 @@ sub activate_storage {
die "unable to activate storage '$storeid' - " .
"directory '$path' does not exist\n" if ! -d $path;
- my $server = &$get_active_server($scfg, 1);
+ my $server = get_active_server($scfg, 1);
glusterfs_mount($server, $volume, $path);
}
@@ -347,7 +347,7 @@ sub deactivate_volume {
sub check_connection {
my ($class, $storeid, $scfg, $cache) = @_;
- my $server = &$get_active_server($scfg);
+ my $server = get_active_server($scfg);
return defined($server) ? 1 : 0;
}
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel