Commit review 9586

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
This commit is contained in:
Brenn Oosterbaan 2013-02-25 14:38:13 +01:00 committed by Hugo Trippaers
parent 6675d2c1a3
commit c30da35811

View File

@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the # to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance # "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at # with the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, # Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an # software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -17,9 +17,9 @@
# under the License. # under the License.
#set -x #set -x
usage() { usage() {
printf "Usage: %s [uuid of this host] [interval in seconds]\n" $(basename $0) >&2 printf "Usage: %s [uuid of this host] [timeout in seconds] [interval in seconds]\n" $(basename $0) >&2
} }
@ -33,10 +33,24 @@ if [ -z $2 ]; then
exit 3 exit 3
fi fi
if [ ! -z $3 ]; then
interval=$3
else
interval=10
fi
if [ $interval -gt $2 ]; then
usage
exit 3
fi
file=/opt/xensource/bin/heartbeat file=/opt/xensource/bin/heartbeat
while true maxtries=$(($2 / $interval))
do tries=1
sleep $2
while [ $tries -le $maxtries ]
do
sleep $interval
if [ ! -f $file ] if [ ! -f $file ]
then then
@ -51,13 +65,17 @@ do
hb=$dir/hb-$1 hb=$dir/hb-$1
date +%s | dd of=$hb count=100 bs=1 2>/dev/null date +%s | dd of=$hb count=100 bs=1 2>/dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
/usr/bin/logger -t heartbeat "Problem with $hb" /usr/bin/logger -t heartbeat "Potential problem with $hb: not reachable since $(($tries * $interval)) seconds"
reboot -f tries=$(($tries + 1))
else
tries=1
fi fi
else else
/usr/bin/logger -t heartbeat "Heartbeat dir not found for $dir"
sed -i /${dir##/*/}/d $file sed -i /${dir##/*/}/d $file
fi fi
done done
# for nfs # for nfs
dirs=$(cat $file | grep sr-mount) dirs=$(cat $file | grep sr-mount)
for dir in $dirs for dir in $dirs
@ -67,13 +85,17 @@ do
hb=$dir/hb-$1 hb=$dir/hb-$1
date +%s | dd of=$hb count=100 bs=1 2>/dev/null date +%s | dd of=$hb count=100 bs=1 2>/dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
/usr/bin/logger -t heartbeat "Problem with $hb" /usr/bin/logger -t heartbeat "Potential problem with $hb: not reachable since $(($tries * $interval)) seconds"
reboot -f tries=$(($tries + 1))
else
tries=1
fi fi
else else
/usr/bin/logger -t heartbeat "Heartbeat mount not found for $dir"
sed -i /${dir##/*/}/d $file sed -i /${dir##/*/}/d $file
fi fi
done done
done done
/usr/bin/logger -t heartbeat "Problem with $hb: not reachable for $2 seconds, rebooting system!"
reboot -f