xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

Fix #3082, to avoid named is started twice in short time. (#3388)

Browse Source
This commit is contained in:
Bin Xu 2017-07-04 15:03:11 +08:00 committed by yangsong
parent 2c97eded50
commit d9ab5b7558
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
xCAT-server/lib/xcat/plugins/ddns.pm
View File

@ -610,7 +610,7 @@ sub process_request {
my @dnsifinsite = xCAT::TableUtils->get_site_attribute("dnsinterfaces");
if (@dnsifinsite)
#syntax should be like host|ifname1,ifname2;host2|ifname3,ifname2 etc or simply ifname,ifname2
#syntax should be like host|ifname1,ifname2;host2|ifname3,ifname2 etc or simply ifname,ifname2
{
my $dnsinterfaces = $dnsifinsite[0];
my $listenonifs;
@ -865,29 +865,23 @@ sub process_request {
}
else
{
#my $cmd = "service $service status|grep running";
#my @output=xCAT::Utils->runcmd($cmd, 0);
#if ($::RUNCMD_RC != 0)
#{
# $cmd = "service $service start";
# @output=xCAT::Utils->runcmd($cmd, 0);
# my $outp = join('', @output);
# if ($::RUNCMD_RC != 0)
# {
# my $rsp = {};
# $rsp->{data}->[0] = "Command failed: $cmd. Error message: $outp.\n";
# xCAT::MsgUtils->message("E", $rsp, $callback);
# return;
# }
#}
my $retcode = xCAT::Utils->startservice("named");
if ($retcode != 0)
my $needtostart = 1;
# If named is already restarted in the same time, then to avoid starting it again.
# Rare case (#3082): to avoid two named daemon co-existing
if ($ctx->{restartneeded}) {
sleep 1;
$needtostart = xCAT::Utils->checkservicestatus("named");
}
if ($needtostart != 0)
{
my $rsp = {};
$rsp->{data}->[0] = "failed to start named.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
return;
my $retcode = xCAT::Utils->startservice("named");
if ($retcode != 0)
{
my $rsp = {};
$rsp->{data}->[0] = "failed to start named.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
return;
}
}
}
}