From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Stefan Sterz <s.sterz@proxmox.com>,
m.carrara@proxmox.com
Subject: Re: [pve-devel] [PATCH pve-manager 1/2] fix #5198: ceph: mon: fix mon existence check in mon removal assertion
Date: Thu, 14 Mar 2024 08:56:57 +0100 [thread overview]
Message-ID: <3877e8ba-5aec-46fa-922a-458a08243203@proxmox.com> (raw)
In-Reply-To: <CZSQJKAR83OT.GQ4AT0S8C94O@proxmox.com>
Am 13.03.24 um 16:42 schrieb Stefan Sterz:
> On Wed Mar 13, 2024 at 3:53 PM CET, Max Carrara wrote:
>> The Ceph monitor removal assertion contains a condition that checks
>> whether the given mon ID actually exists and thus may be removed.
>>
>> The first part of the condition checks whether the hash returned by
>> `get_services_info` [0] contains the key "mon.$monid". However, the
>> hash's keys are never prefixed with "mon.", which makes this check
>> incorrect.
>>
>> This is fixed by just using "$monid" directly.
>>
>> The second part checks whether the mon hashes returned by
>> Ceph contain the "name" key before comparing the key with the given
>> mon ID. This key existence check is also incorrect; in particular:
>> * If the lookup `$_->{name}` evaluates to e.g. "foo", the check
>> passes, because "foo" is truthy. [1]
>> * If the lookup `$_->{name}` evaluates to "0", the check fails,
>> because "0" is falsy (due to it being equivalent to the number 0,
>> according to Perl [1]).
>>
>> This is solved by using the inbuilt `exists()` instead of relying on
>> Perl's definition of truthiness.
>>
Technically, it's two changes, so could be two patches, but can be fine
like this too, since both touch the same check.
>> [0]: https://git.proxmox.com/?p=pve-manager.git;a=blob;f=PVE/Ceph/Services.pm;h=e0f31e8eb6bc9b3777b3d0d548497276efaa5c41;hb=HEAD#l112
>> [1]: https://perldoc.perl.org/perldata#Scalar-values
>>
>> Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=5198
>> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
>> ---
>> PVE/API2/Ceph/MON.pm | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm
>> index 1e959ef3..1737c294 100644
>> --- a/PVE/API2/Ceph/MON.pm
>> +++ b/PVE/API2/Ceph/MON.pm
>> @@ -147,8 +147,8 @@ my $assert_mon_prerequisites = sub {
>> my $assert_mon_can_remove = sub {
>> my ($monhash, $monlist, $monid, $mondir) = @_;
>>
>> - if (!(defined($monhash->{"mon.$monid"}) ||
>> - grep { $_->{name} && $_->{name} eq $monid } @$monlist))
>
> not sure if splitting the fix and the code style clean up makes sense
> here but otherwise this works as advertised. So:
>
If you already touch the same line, you can also adapt style in one go.
But since the style change is also done in a second place, which is not
touched by this patch, it's fine like Max did it too.
> Tested-by: Stefan Sterz <s.sterz@proxmox.com>
>
>> + if (!(defined($monhash->{$monid}) ||
>> + grep { exists($_->{name}) && $_->{name} eq $monid } @$monlist))
While I suppose we do not expect an entry with undef value here, you do
not want to compare against undef (just leads to an ugly Perl warning),
so this should be a definedness check, not an existence check.
>> {
>> die "no such monitor id '$monid'\n"
>> }
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
next prev parent reply other threads:[~2024-03-14 7:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 14:53 Max Carrara
2024-03-13 14:53 ` [pve-devel] [PATCH pve-manager 2/2] ceph: mon: adapt code style " Max Carrara
2024-03-13 15:42 ` [pve-devel] [PATCH pve-manager 1/2] fix #5198: ceph: mon: fix mon existence check " Stefan Sterz
2024-03-14 7:56 ` Fiona Ebner [this message]
2024-03-14 9:34 ` Max Carrara
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=3877e8ba-5aec-46fa-922a-458a08243203@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=m.carrara@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=s.sterz@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