xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-24 15:05:36 +00:00
Code Issues Releases Wiki Activity

Do not kill db process if immediate child process exists

Browse Source 
This change includes the following:

- Replace the signal number with signal name.
- Stop db process after all the immediate children stopped.
- Fix a defect in TableUtils when closing the table object.
- Enhance the is_process_exists subroutine in utils.

Close issue: #537
This commit is contained in:
chenglch
2016-03-22 02:29:34 -04:00
parent e8f3a2b295
commit 306e66e4cc
3 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/TableUtils.pm
View File

@ -1240,13 +1240,13 @@ sub get_site_attribute
{
$values = $ref->{value};
}
$sitetab->close;
}
else
{
xCAT::MsgUtils->message("E", " Could not read the site table\n");
}
$sitetab->close;
}
return $values;
}

12
perl-xCAT/xCAT/Utils.pm
View File

@ -16,6 +16,7 @@ if ($^O =~ /^aix/i) {
use lib "$::XCATROOT/lib/perl";
# do not put a use or require for xCAT::Table here. Add to each new routine
# needing it to avoid reprocessing of user tables ( ExtTab.pm) for each command call
use Error;
use POSIX qw(ceil);
use File::Path;
use Socket;
@ -4642,10 +4643,13 @@ sub lookupNetboot{
#--------------------------------------------------------------------------------
sub is_process_exists{
my $pid = shift;
my $cmd = "kill -0 $pid";
xCAT::Utils->runcmd($cmd, -1);
if ( $::RUNCMD_RC == 0 ) {
return 1;
return 1 if $pid == 0;
my $ret = kill(0, $pid);
return 0 if ($!{ESRCH});
return 1 if ($!{EPERM});
if ($ret != 0 ) {
return 1;
}
return 0;
}

45
xCAT-server/sbin/xcatd
View File

@ -322,7 +322,7 @@ sub do_installm_service {
my $pid = <$installpidfile>;
if ($pid) {
$retry=100; # grace period for old instance to get out of the way, 5 seconds
kill 12,$pid;
kill 'USR2',$pid;
yield(); # let peer have a shot at closure
}
close($installpidfile);
@ -661,7 +661,7 @@ sub do_udp_service { # This function opens up a UDP port
$udpctl=0;
xCAT::MsgUtils->message("S","xcatd udp service $$ quiescing");
}
kill(15,$discopid);
kill('TERM',$discopid);
};
if ($inet6support) {
$socket = IO::Socket::INET6->new(LocalPort => $port,
@ -676,7 +676,7 @@ sub do_udp_service { # This function opens up a UDP port
my $pid = <$udppidfile>;
if ($pid) {
$retry=100; # grace period for old instance to get out of the way, 5 seconds
kill 12,$pid;
kill 'USR2',$pid;
yield(); # let peer have a shot at closure
}
close($udppidfile);
@ -953,31 +953,24 @@ $SIG{TERM} = $SIG{INT} = sub {
#printf("Asked to quit...\n");
$quit++;
foreach (keys %dispatched_children) {
kill 2, $_;
kill 'INT', $_;
}
foreach (keys %plugin_children) {
kill 2, $_;
kill 'INT', $_;
}
if ($pid_UDP) {
kill 12, $pid_UDP;
kill 'USR2', $pid_UDP;
}
if ($pid_MON) {
kill 2, $pid_MON;
kill 12, $pid_MON;
kill 'INT', $pid_MON;
kill 'USR2', $pid_MON;
}
xCAT::Table::shut_dbworker;
if ($dbmaster) {
kill 2, $dbmaster;
}
# ----used for command log start---------
if ($cmdlog_svrpid){
kill 2, $cmdlog_svrpid;
kill 'INT', $cmdlog_svrpid;
}
# ----used for command log end---------
$SIG{ALRM} = sub { xexit 0; }; #die "Did not close out in time for 5 second grace period"; };
alarm(2);
};
socketpair($sslctl, $udpctl,AF_UNIX,SOCK_STREAM,PF_UNSPEC);
@ -1015,7 +1008,7 @@ unless ($pid_UDP) {
$SIG{TERM} = $SIG{INT} = sub {
if ($pid_disco) {
kill 2, $pid_disco;
kill 'INT', $pid_disco;
}
$SIG{ALRM} = sub { xexit 0; }; #die "Did not close out in time for 2 second grace period";
alarm(2);
@ -1247,7 +1240,7 @@ if (not $listener and open($mainpidfile,"<","/var/run/xcat/mainservice.pid")) {
my $pid = <$mainpidfile>;
if ($pid) {
$retry=100; # grace period for old instance to get out of the way, 5 seconds
kill 12,$pid;
kill 'USR2',$pid;
yield(); # let peer have a shot at closure
}
close($mainpidfile);
@ -1274,11 +1267,11 @@ my $udpwatcher = IO::Select->new($udpctl);
my $bothwatcher = IO::Select->new($udpctl, $listener);
unless ($listener) {
kill 2, $pid_UDP;
kill 2, $pid_MON;
kill 'INT', $pid_UDP;
kill 'INT', $pid_MON;
xCAT::Table::shut_dbworker;
if ($dbmaster) {
kill 2, $dbmaster;
kill 'INT', $dbmaster;
}
xCAT::MsgUtils->message("S","xCAT service unable to open SSL services on $port: $!");
closelog();
@ -1482,7 +1475,7 @@ while (keys %immediatechildren) {
}
xCAT::Table::shut_dbworker;
if ($dbmaster) {
kill 2, $dbmaster;
kill 'INT', $dbmaster;
}
# stop the monitoring process
@ -1680,7 +1673,7 @@ sub plugin_command {
# make the request handler process to take care all the plugin children
$SIG{TERM} = $SIG{INT} = sub {
foreach (keys %plugin_children) {
kill 2, $_;
kill 'INT', $_;
}
$SIG{ALRM} = sub { xexit 0; }; # wait 1s for grace exit
alarm(1);
@ -2060,7 +2053,7 @@ sub dispatch_request {
$SIG{CHLD} = \&dispatch_reaper; #sub {my $cpid; while (($cpid =waitpid(-1, WNOHANG)) > 0) { if ($dispatched_children{$cpid}) { delete $dispatched_children{$cpid}; $dispatch_children--; } } };
$SIG{TERM} = $SIG{INT} = sub {
foreach (keys %dispatched_children) {
kill 2, $_;
kill 'INT', $_;
}
$SIG{ALRM} = sub { xexit 0; }; # wait 1s for grace exit
alarm(1);
@ -2766,8 +2759,8 @@ 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";
kill 2, $_;
kill 15, $_;
kill 'INT', $_;
kill 'TERM', $_;
}
foreach my $cin ($fds->handles) {
print $cin "die\n";