From: Kefu Chai <k.chai@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH librados2-perl] do not shut down the handle twice if a signal arrives at exit
Date: Tue, 20 Oct 2026 22:12:23 +0800 [thread overview]
Message-ID: <20261020141223.2814127-1-k.chai@proxmox.com> (raw)
When a pveceph worker finishes, the CLI sends SIGTERM to its process
group, which includes the pverados child. That child is often already
shutting down the handle after seeing EOF, so the handler then calls
rados_shutdown() on the freed handle and the child segfaults.
The handlers outlived the eval anyway, as the 'local' only covered
$SIG{HUP}. So ignore the signals before shutting down, and install the
handlers first thing in the child.
Signed-off-by: Kefu Chai <k.chai@proxmox.com>
---
PVE/RADOS.pm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/PVE/RADOS.pm b/PVE/RADOS.pm
index 5a79235..deb4912 100644
--- a/PVE/RADOS.pm
+++ b/PVE/RADOS.pm
@@ -200,6 +200,17 @@ sub new {
} else { # child
$0 = 'pverados';
+ my @signals = qw(HUP INT QUIT TERM);
+
+ # ignore signals from here on, the handler must not shut down a freed handle
+ my $shutdown = sub {
+ @SIG{@signals} = ('IGNORE') x @signals;
+ pve_rados_shutdown($self->{conn}) if $self->{conn};
+ };
+
+ # override signal handlers inherited from the parent
+ @SIG{@signals} = (sub { $shutdown->(); POSIX::_exit(1); }) x @signals;
+
eval {
PVE::INotify::inotify_close();
@@ -207,12 +218,6 @@ sub new {
&$atfork();
}
- # override signal handlers inherited from the parent
- local $SIG{HUP} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
- pve_rados_shutdown($self->{conn}) if $self->{conn};
- POSIX::_exit(1);
- };
-
# fixme: timeout?
close $child;
@@ -222,7 +227,7 @@ sub new {
my $err = $@;
warn $err if $err;
- pve_rados_shutdown($self->{conn}) if $self->{conn};
+ $shutdown->();
POSIX::_exit($err ? 1 : 0);
}
--
2.47.3
next reply other threads:[~2026-10-20 14:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-20 14:12 Kefu Chai [this message]
2026-10-20 14:59 ` [PATCH librados2-perl] do not shut down the handle twice if a signal arrives at exit Maximiliano Sandoval
2026-10-21 7:47 ` Maximiliano Sandoval
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=20261020141223.2814127-1-k.chai@proxmox.com \
--to=k.chai@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.