proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-15 09:22:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: ceph: mon: factor out mon_host regex address removal

Browse Source 
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-05-10 14:18:24 +02:00 committed by Thomas Lamprecht
parent 9e989449ae
commit 3e10f0fcdb
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
PVE/API2/Ceph/MON.pm
View File

@ -127,6 +127,34 @@ my $assert_mon_can_remove = sub {
die "can't remove last monitor\n" if scalar(@$monlist) <= 1; die "can't remove last monitor\n" if scalar(@$monlist) <= 1;
}; };
my $remove_addr_from_mon_host = sub {
my ($monhost, $addr) = @_;
# various replaces to remove the ip
# we always match the beginning or a separator (also at the end)
# so we do not accidentally remove a wrong ip
# e.g. removing 10.0.0.1 should not remove 10.0.0.101 or 110.0.0.1
# remove vector containing this ip
# format is [vX:ip:port/nonce,vY:ip:port/nonce]
my $vectorpart_re = "v\\d+:\Q$addr\E:\\d+\\/\\d+";
$monhost =~ s/(^|[ ,;]*)\[$vectorpart_re(?:,$vectorpart_re)*\](?:[ ,;]+|$)/$1/;
# ip (+ port)
$monhost =~ s/(^|[ ,;]+)\Q$addr\E(?::\d+)?(?:[ ,;]+|$)/$1/;
# ipv6 only without brackets
if ($addr =~ m/^\[?(.*?:.*?)\]?$/) {
$addr = $1;
$monhost =~ s/(^|[ ,;]+)\Q$addr\E(?:[ ,;]+|$)/$1/;
}
# remove trailing separators
$monhost =~ s/[ ,;]+$//;
return $monhost;
};
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'listmon', name => 'listmon',
path => '', path => '',
@ -471,29 +499,7 @@ __PACKAGE__->register_method ({
# delete from mon_host # delete from mon_host
if (my $monhost = $cfg->{global}->{mon_host}) { if (my $monhost = $cfg->{global}->{mon_host}) {
# various replaces to remove the ip $cfg->{global}->{mon_host} = $remove_addr_from_mon_host->($monhost, $addr);
# we always match the beginning or a separator (also at the end)
# so we do not accidentally remove a wrong ip
# e.g. removing 10.0.0.1 should not remove 10.0.0.101 or 110.0.0.1
# remove vector containing this ip
# format is [vX:ip:port/nonce,vY:ip:port/nonce]
my $vectorpart_re = "v\\d+:\Q$addr\E:\\d+\\/\\d+";
$monhost =~ s/(^|[ ,;]*)\[$vectorpart_re(?:,$vectorpart_re)*\](?:[ ,;]+|$)/$1/;
# ip (+ port)
$monhost =~ s/(^|[ ,;]+)\Q$addr\E(?::\d+)?(?:[ ,;]+|$)/$1/;
# ipv6 only without brackets
if ($addr =~ m/^\[?(.*?:.*?)\]?$/) {
$addr = $1;
$monhost =~ s/(^|[ ,;]+)\Q$addr\E(?:[ ,;]+|$)/$1/;
}
# remove trailing separators
$monhost =~ s/[ ,;]+$//;
$cfg->{global}->{mon_host} = $monhost;
} }
cfs_write_file('ceph.conf', $cfg); cfs_write_file('ceph.conf', $cfg);