From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH cluster] fix #3596: handle delnode of offline node
Date: Fri, 12 Nov 2021 09:45:27 +0100 [thread overview]
Message-ID: <20211112084527.109038-1-f.gruenbichler@proxmox.com> (raw)
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);
+ };
- PVE::Tools::run_command(['corosync-cfgtool','-k', $nodeid]) if defined($nodeid);
+ PVE::Corosync::update_nodelist($conf, $nodelist);
};
$config_change_lock->($code);
--
2.30.2
next reply other threads:[~2021-11-12 8:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 8:45 Fabian Grünbichler [this message]
2021-11-12 10:04 ` [pve-devel] applied: " Thomas Lamprecht
2021-11-12 11:50 ` [pve-devel] " Fabian Ebner
2021-11-12 12:14 ` 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=20211112084527.109038-1-f.gruenbichler@proxmox.com \
--to=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