xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-03 03:50:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1410 from chenglch/xcatd_db

Browse Source 
Wait the completion of monitor and cmdlog process
This commit is contained in:
Xiaopeng Wang 2016-06-28 16:08:03 +08:00 committed by GitHub
commit f678a30de4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xCAT-server/sbin/xcatd
View File

@ -915,6 +915,13 @@ sub ssl_reaper {
if (($CHILDPID == $pid_UDP) && ($udpctl)) {
# got here because UDP child is gone
close($udpctl); $udpctl=0;
$pid_UDP = 0;
}
if ($CHILDPID == $cmdlog_svrpid) {
$cmdlog_svrpid = 0;
}
if ($CHILDPID == $pid_MON) {
$pid_MON = 0;
}
}
$SIG{CHLD} = \&ssl_reaper;
@ -1470,12 +1477,16 @@ if (open($mainpidfile,"<","/var/run/xcat/mainservice.pid")) {
}
if ($listener) { $listener->close; }
my $lastpid;
while (keys %immediatechildren || $pid_UDP) {
while (keys %immediatechildren || $pid_UDP || $cmdlog_svrpid || $pid_MON) {
$lastpid=wait();
if ($immediatechildren{$lastpid}) {
delete $immediatechildren{$lastpid};
} elsif ($lastpid == $pid_UDP) {
$pid_UDP = 0;
} elsif ($lastpid == $cmdlog_svrpid) {
$cmdlog_svrpid = 0;
} elsif ($lastpid == $pid_MON) {
$pid_MON = 0;
}
}
xCAT::Table::shut_dbworker;