arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Have xcatd launch process monitor xCAT SSL instance to assure it gets off the ground before exiting

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13931 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-10-02 17:52:18 +00:00
parent 3ae89517fa
commit 3004f6493f
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xCAT-server/sbin/xcatd
View File

@ -189,16 +189,19 @@ if (xCAT::Utils->isMN()) {
`$::XCATROOT/sbin/runsqlcmd`;
}
my $startupchild;
my $startupparent;
sub daemonize {
chdir('/');
umask 0022;
my $pid;
socketpair($startupparent,$startupchild,AF_UNIX,SOCK_STREAM,PF_UNSPEC);
if (! defined($pid = xCAT::Utils->xfork)) {
xCAT::MsgUtils->message("S","Can't fork: $!");
die;
}
if ($pid) {
close($startupparent); # the launcher only wants to examing startupchild
if ($pidfile) {
open(PFILE, '>', $pidfile);
print PFILE $pid;
@ -206,10 +209,18 @@ sub daemonize {
} else {
xCAT::MsgUtils->message("S","xCATd starting as PID $pid");
}
my $result=<$startupchild>;
chomp($result);
unless ($result) { exit (1); }
if ($result ne "SUCCESS") {
xCAT::MsgUtils->message("S","xCATd failed to start: $result");
exit(1);
}
exit;
}
close($startupchild); # only want child to report up to parent...
if (! open STDIN, '/dev/null') {
xCAT::MsgUtils->message("S","Can't read /dev/null: $!");
print $startupparent "Can't read /dev/null: $!\n";
die;
}
open STDOUT, '>/dev/null';
@ -218,6 +229,7 @@ sub daemonize {
$progname = \$0;
if (! setsid) {
xCAT::MsgUtils->message("S","Can't start new session");
print $startupparent "Can't start new session\n";
die;
}
}
@ -852,8 +864,16 @@ unless ($listener) {
}
xCAT::MsgUtils->message("S","xCAT service unable to open SSL services on $port: $!");
closelog();
if ($startupparent) {
print $startupparent "Unable to perform socket takeover from existing xCAT instance\n";
}
die "ERROR:Unable to start xCAT service on port $port.";
}
if ($startupparent) {
print $startupparent "SUCCESS\n";
}
#only write to pid file if we have listener, listener ownership serves as lock to protect integrity
open($mainpidfile,">","/var/run/xcat/mainservice.pid"); #if here, everyone else has unlinked mainservicepid or doesn't care
print $mainpidfile $$;