xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-10 13:30:15 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2417 from cxhong/2398

Browse Source 
makentp -a returns NTP maynot be synchronized on servicenode
This commit is contained in:
yangsong
2017-01-23 02:36:43 -06:00
committed by GitHub
parent b1adaf4ac2 3586bea59b
commit 69d893cefa
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-server/lib/xcat/plugins/makentp.pm
View File

@@ -366,6 +366,7 @@ sub process_request {
}
if ($::RUNCMD_RC != 0) {
send_msg(\%request, 1, "Error from command $cmd\n $result.");
send_msg(\%request, 1, "Please check $ntp_master, make sure time is synced (can be validated by 'ntpq -p'), then rerun makentp command again ");
return 1;
}
}

17
xCAT/postscripts/setupntp
View File

@@ -126,9 +126,12 @@ if [ $OS_TYPE = Linux ]; then
output=`eval $cmd 2>&1`
rc=$?
if [ "$rc" != "0" ] || (pmatch "$output" "*Time could not*");then
echo "$cmd failed, NTP maynot be synchronized, please wait for NTP synchronized then run updatenode nodename -P setupntp"
echo "WARNING: "
echo " $cmd failed, NTP may not be synchronized on NTP server "
echo " please wait for NTP synchronized, may take at least 15 mins"
echo " use 'ntpq -p' command (output has "*" or "+" sign) to validate the NTP server"
echo " run 'updatenode nodename -P setupntp' if NTP is synced on NTP server but nodename is not synced"
logger -t xcat "$cmd failed"
exit 1
fi
else
logger -t xcat "ntpdate -t5 $master "
@@ -144,7 +147,7 @@ if [ $OS_TYPE = Linux ]; then
#setup the RTC is UTC format, which will be used by os
if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
grep -i "HWCLOCK" /etc/sysconfig/clock
grep -i -q "HWCLOCK" /etc/sysconfig/clock
if [ $? -eq 0 ];then
sed -i 's/.*HWCLOCK.*/HWCLOCK=\"-u\"/' /etc/sysconfig/clock
else
@@ -154,7 +157,7 @@ if [ $OS_TYPE = Linux ]; then
sed -i 's/.*UTC.*/UTC=\"yes\"/' /etc/default/rcS
else
if [ -f "/etc/sysconfig/clock" ];then
grep -i "utc" /etc/sysconfig/clock
grep -i -q "utc" /etc/sysconfig/clock
if [ $? -eq 0 ];then
sed -i 's/.*UTC.*/UTC=\"yes\"/' /etc/sysconfig/clock
else
@@ -167,18 +170,18 @@ if [ $OS_TYPE = Linux ]; then
#update the hardware clock automaticly
if [ -f "/etc/sysconfig/ntpd" ];then
grep -i "SYNC_HWCLOCK" /etc/sysconfig/ntpd
grep -i -q "SYNC_HWCLOCK" /etc/sysconfig/ntpd
if [ $? -eq 0 ];then
sed -i 's/.*SYNC_HWCLOCK.*/SYNC_HWCLOCK=\"yes\"/' /etc/sysconfig/ntpd
else
echo "SYNC_HWCLOCK=\"yes\"" >> /etc/sysconfig/ntpd
fi
elif [ -f /etc/sysconfig/ntp ];then
grep -i "NTPD_FORCE_SYNC_ON_STARTUP" /etc/sysconfig/ntp
grep -i -q "NTPD_FORCE_SYNC_ON_STARTUP" /etc/sysconfig/ntp
if [ $? -eq 0 ];then
sed -i 's/NTPD_FORCE_SYNC_ON_STARTUP=\"no\"/NTPD_FORCE_SYNC_ON_STARTUP=\"yes\"/' /etc/sysconfig/ntp
fi
grep -i "NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP" /etc/sysconfig/ntp
grep -i -q "NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP" /etc/sysconfig/ntp
if [ $? -eq 0 ];then
sed -i 's/NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=\"no\"/NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=\"yes\"/' /etc/sysconfig/ntp
fi