From c088fe72cb2dde3bf9ee9578417c26dfbc36d4d2 Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 4 Sep 2013 10:36:15 +0000 Subject: Related to Ticket #3045 avoid races in the ntpdate_sync_one script due to killall returning without the process really exiting. --- usr/local/sbin/ntpdate_sync_once.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'usr/local/sbin') diff --git a/usr/local/sbin/ntpdate_sync_once.sh b/usr/local/sbin/ntpdate_sync_once.sh index 3809b23..ac9a16f 100755 --- a/usr/local/sbin/ntpdate_sync_once.sh +++ b/usr/local/sbin/ntpdate_sync_once.sh @@ -3,14 +3,25 @@ NOTSYNCED="true" MAX_ATTEMPTS=3 SERVER=`/bin/cat /cf/conf/config.xml | /usr/bin/grep timeservers | /usr/bin/cut -d">" -f2 | /usr/bin/cut -d"<" -f1` +if [ "${SERVER}" = "" ]; then + exit +fi + /bin/pkill -f ntpdate_sync_once.sh ATTEMPT=1 # Loop until we're synchronized, but for a set number of attempts so we don't get stuck here forever. while [ "$NOTSYNCED" = "true" ] && [ ${ATTEMPT} -le ${MAX_ATTEMPTS} ]; do # Ensure that ntpd and ntpdate are not running so that the socket we want will be free. - /usr/bin/killall ntpd 2>/dev/null - /usr/bin/killall ntpdate 2>/dev/null + while [ true ]; do + /usr/bin/killall ntpdate 2>/dev/null + /bin/pgrep ntpd + if [ $? -eq 0 ]; then + /usr/bin/killall ntpd 2>/dev/null + else + break + fi + done sleep 1 /usr/sbin/ntpdate -s -t 5 ${SERVER} if [ "$?" = "0" ]; then -- cgit v1.1