public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH manager] api: ceph: mon: make checking for duplicate addresses more robust
Date: Tue, 7 Jun 2022 09:20:50 +0200	[thread overview]
Message-ID: <52de6200-3e7d-4970-341f-6793f84e063e@proxmox.com> (raw)
In-Reply-To: <20220304130908.61564-1-f.ebner@proxmox.com>

Ping

Am 04.03.22 um 14:09 schrieb Fabian Ebner:
> Because $mon->{addr} might come with a port attached (affects monitors
> created with PVE 5.4 as reported in the community forum [0]), or even
> be a hostname (according to the code in Ceph/Services.pm). Although
> the latter shouldn't happen for configurations created by PVE.
> 
> [0]: https://forum.proxmox.com/threads/105904/
> 
> Fixes: 86ed64f9 ("api: ceph: mon: fix handling of IPv6 addresses in assert_mon_prerequisites")
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>  PVE/API2/Ceph/MON.pm | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm
> index 12c9caf0..5771bb46 100644
> --- a/PVE/API2/Ceph/MON.pm
> +++ b/PVE/API2/Ceph/MON.pm
> @@ -132,8 +132,10 @@ my $assert_mon_prerequisites = sub {
>      for my $mon (values %{$monhash}) {
>  	next if !defined($mon->{addr});
>  
> -	my $ip = PVE::Network::canonical_ip($mon->{addr});
> -	$used_ips->{$ip} = 1;
> +	for my $ip ($ips_from_mon_host->($mon->{addr})->@*) {
> +	    $ip = PVE::Network::canonical_ip($ip);
> +	    $used_ips->{$ip} = 1;
> +	}
>      }
>  
>      for my $monip (@{$monips}) {




  reply	other threads:[~2022-06-07  7:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-04 13:09 Fabian Ebner
2022-06-07  7:20 ` Fabian Ebner [this message]
2022-06-08  6:50 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52de6200-3e7d-4970-341f-6793f84e063e@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal