From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH cluster v2 2/2] cfs lock: unlock when encountering signal
Date: Wed, 18 Feb 2026 16:44:30 +0100 [thread overview]
Message-ID: <20260218154438.184685-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20260218154438.184685-1-f.ebner@proxmox.com>
If the lock directory is not removed after failing because of a
signal, it won't be possible to acquire the lock anymore before the
120 second timeout imposed on the lock by pmxcfs. This can easily
happen by a second, unrelated task in production and is quite
surprising. Install a signal handler that releases the lock if it was
already acquired. If an old handler is defined, it is invoked,
otherwise the signal is raised again. Just using 'die' would change
the execution flow compared to before the change.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
src/PVE/Cluster.pm | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/PVE/Cluster.pm b/src/PVE/Cluster.pm
index bdb465f..7165d1c 100644
--- a/src/PVE/Cluster.pm
+++ b/src/PVE/Cluster.pm
@@ -615,6 +615,22 @@ my $cfs_lock = sub {
my $is_code_err = 0;
eval {
+ # catch signals to release the lock - further defer to old handler if one was set
+ my $old_sig;
+ $old_sig->{$_} = $SIG{$_} for qw(INT TERM QUIT HUP PIPE);
+
+ local $SIG{INT} = local $SIG{TERM} = local $SIG{QUIT} = local $SIG{HUP} =
+ local $SIG{PIPE} = sub {
+ my $signame = $_[0];
+ rmdir $filename if $got_lock; # if we held the lock always unlock again
+ if ($old_sig->{$signame}) {
+ $old_sig->{$signame}->(@_);
+ } else {
+ $SIG{$signame} = 'DEFAULT';
+ POSIX::raise($signame);
+ }
+ die "interrupted by signal\n";
+ };
mkdir $lockdir;
--
2.47.3
next prev parent reply other threads:[~2026-02-18 15:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-18 15:44 [PATCH-SERIES cluster v2 0/2] cfs lock: small improvements Fiona Ebner
2026-02-18 15:44 ` [PATCH cluster v2 1/2] cfs lock: attempt to acquire lock more frequently Fiona Ebner
2026-02-18 15:44 ` Fiona Ebner [this message]
2026-02-18 18:33 ` [PATCH cluster v2 2/2] cfs lock: unlock when encountering signal Thomas Lamprecht
2026-02-19 13:45 ` Fiona Ebner
2026-02-18 18:33 ` partially-applied: [PATCH-SERIES cluster v2 0/2] cfs lock: small improvements 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=20260218154438.184685-3-f.ebner@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