From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com,
"Fabian Grünbichler" <f.gruenbichler@proxmox.com>
Subject: Re: [pve-devel] [PATCH cluster] fix #3596: handle delnode of offline node
Date: Fri, 12 Nov 2021 12:50:46 +0100 [thread overview]
Message-ID: <b5fdb4ce-d6fa-b05b-7895-6119c7f51622@proxmox.com> (raw)
In-Reply-To: <20211112084527.109038-1-f.gruenbichler@proxmox.com>
Am 12.11.21 um 09:45 schrieb Fabian Grünbichler:
> the recommended way is to first shutdown, then delnode, and never let it
> come back online, in which case corosync-cfgtool won't be able to kill
> the removed (offline) node.
>
> also, the order was wrong - if we first update corosync.conf to remove
> the node entry from the nodelist, corosync doesn't know about the nodeid
> anymore, so killing will fail even if the node is still online.
>
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> data/PVE/API2/ClusterConfig.pm | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/data/PVE/API2/ClusterConfig.pm b/data/PVE/API2/ClusterConfig.pm
> index 8f4a5bb..5a6a1ac 100644
> --- a/data/PVE/API2/ClusterConfig.pm
> +++ b/data/PVE/API2/ClusterConfig.pm
> @@ -485,9 +485,13 @@ __PACKAGE__->register_method ({
>
> delete $nodelist->{$node};
>
> - PVE::Corosync::update_nodelist($conf, $nodelist);
> + # allowed to fail when node is already shut down!
> + eval {
> + PVE::Tools::run_command(['corosync-cfgtool','-k', $nodeid])
> + if defined($nodeid);
> + };
>
But what if it fails for a different reason than 'CS_ERR_NOT_EXIST'?
Shouldn't we match the error?
> - PVE::Tools::run_command(['corosync-cfgtool','-k', $nodeid]) if defined($nodeid);
> + PVE::Corosync::update_nodelist($conf, $nodelist);
> };
>
> $config_change_lock->($code);
>
next prev parent reply other threads:[~2021-11-12 11:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 8:45 Fabian Grünbichler
2021-11-12 10:04 ` [pve-devel] applied: " Thomas Lamprecht
2021-11-12 11:50 ` Fabian Ebner [this message]
2021-11-12 12:14 ` [pve-devel] " Thomas Lamprecht
2021-11-12 12:46 ` Fabian Ebner
2021-11-12 13:03 ` Thomas Lamprecht
2021-11-12 12:59 ` Fabian Grünbichler
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=b5fdb4ce-d6fa-b05b-7895-6119c7f51622@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=f.gruenbichler@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