xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

Fix github issue #448. From now on, send SIGINT signal to the whole process group of the xCAT plug-in.

Browse Source
This commit is contained in:
GONG Jie 2016-10-12 18:28:54 +08:00
parent 500dec645e
commit 95ab036840
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-server/sbin/xcatd
View File

@ -1748,7 +1748,11 @@ sub plugin_command {
# make the request handler process to take care all the plugin children
$SIG{TERM} = $SIG{INT} = sub {
foreach (keys %plugin_children) {
# Send signal to the whole process group
kill 'INT', -$_;
kill 'INT', $_;
kill 'TERM', -$_;
kill 'TERM', $_;
}
$SIG{ALRM} = sub { xexit 0; }; # wait 1s for grace exit
alarm(1);
@ -1873,6 +1877,14 @@ sub plugin_command {
binmode($parfd, ':utf8');
binmode($pfd, ':utf8');
$child = xCAT::Utils->xfork;
unless (defined $child) {
xCAT::MsgUtils->message("S", "Fork failed");
die;
}
# Fix github issue #448. For the child process, setpgrp()
# here. In this way, the parent can send SIGINT or SIGTERM
# to all the process group.
setpgrp unless $child;
} else {
if ($req_back) {
$req = dclone($req_back);
@ -1881,10 +1893,6 @@ sub plugin_command {
}
$child = 0;
}
unless (defined $child) {
xCAT::MsgUtils->message("S", "Fork failed");
die;
}
if ($child == 0) {
if ($parfd) { # If xCAT is doing multiple requests in same communication PID, things would get unfortunate otherwise
$parent_fd = $parfd;
@ -2918,7 +2926,10 @@ sub relay_fds { # Relays file descriptors from pipes to children to the SSL sock
print "Aborting...";
foreach (keys %plugin_children) {
print "Sending INT to $_\n";
# Send signal to the whole process group
kill 'INT', -$_;
kill 'INT', $_;
kill 'TERM', -$_;
kill 'TERM', $_;
}
foreach my $cin ($fds->handles) {