xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-26 00:45:38 +00:00
Code Issues Releases Wiki Activity

Not restart xcatd in 'servicenode' when the node is not stateless and statelite as it will fail in postscript stage. (#3872)

Browse Source
This commit is contained in:
Bin Xu
2017-09-07 15:52:53 +08:00
committed by yangsong
parent 94f87ea3ac
commit 6f6a68bc37
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT/postscripts/servicenode
View File

@@ -104,9 +104,9 @@ if ($ENV{UPDATESECURITY} && $ENV{UPDATESECURITY} eq "1") {
&getcreds;
} else { # Linux
# call xcatserver,xcatclient to transfer the SSL credentials and cfgloc
`logger -t xcat -p local4.info $::sdate servicenode: running xcatserver -d`;
`logger -t xcat -p local4.info $::sdate servicenode: running 'xcatserver -d'`;
&runcmd("xcatserver -d");
`logger -t xcat -p local4.info $::sdate servicenode: running xcatclient -d`;
`logger -t xcat -p local4.info $::sdate servicenode: running 'xcatclient -d'`;
&runcmd("xcatclient -d");
}
@@ -141,11 +141,13 @@ else
&runcmd("xcatserver -d");
`logger -t xcat -p local4.info $::sdate servicenode: running 'xcatclient -d'`;
&runcmd("xcatclient -d");
# start xcatd if it is not up
$rc = &runcmd("$::XCATROOT/bin/lsxcatd -v 2>/dev/null|| service xcatd restart");
if ($rc != 0) {
$msg = "$::sdate servicenode: Could not start xcatd.\n\n $::outref \n";
`logger -t xcat -p local4.warning $msg`;
# start xcatd if it is not up when stateless or statelite
if ($ENV{NODESETSTATE} && ($ENV{NODESETSTATE} eq "netboot" || $ENV{NODESETSTATE} eq "statelite")) {
$rc = &runcmd("$::XCATROOT/bin/lsxcatd -v 2>/dev/null || service xcatd restart");
if ($rc != 0) {
$msg = "$::sdate servicenode: Could not start xcatd.\n\n $::outref \n";
`logger -t xcat -p local4.warning $msg`;
}
}
}