Commit review 9586

Brenn Oosterbaan · spark404 · commit c30da358116e · 2013-02-25T14:40:15.000+01:00
Signed-off-by: Hugo Trippaers &lt;htrippaers@schubergphilis.com&gt;
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
@@ -6,9 +6,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,9 +17,9 @@
 # under the License.
 
 #set -x
- 
+
 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
 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
-while true 
-do 
-  sleep $2
+maxtries=$(($2 / $interval))
+tries=1
+
+while [ $tries -le $maxtries ]
+do
+  sleep $interval
 
   if [ ! -f $file  ]
   then
@@ -51,13 +65,17 @@ do
       hb=$dir/hb-$1
       date +%s | dd of=$hb count=100 bs=1 2>/dev/null
       if [ $? -ne 0 ]; then
-          /usr/bin/logger -t heartbeat "Problem with $hb"
-          reboot -f
+          /usr/bin/logger -t heartbeat "Potential problem with $hb: not reachable since $(($tries * $interval)) seconds"
+          tries=$(($tries + 1))
+      else
+          tries=1
       fi
     else
+      /usr/bin/logger -t heartbeat "Heartbeat dir not found for $dir"
       sed -i /${dir##/*/}/d $file
     fi
   done
+
   # for nfs
   dirs=$(cat $file | grep sr-mount)
   for dir in $dirs
@@ -67,13 +85,17 @@ do
       hb=$dir/hb-$1
       date +%s | dd of=$hb count=100 bs=1 2>/dev/null
       if [ $? -ne 0 ]; then
-          /usr/bin/logger -t heartbeat "Problem with $hb"
-          reboot -f
+          /usr/bin/logger -t heartbeat "Potential problem with $hb: not reachable since $(($tries * $interval)) seconds"
+          tries=$(($tries + 1))
+      else
+          tries=1
       fi
     else
+      /usr/bin/logger -t heartbeat "Heartbeat mount not found for $dir"
       sed -i /${dir##/*/}/d $file
     fi
   done
-
 done
 
+/usr/bin/logger -t heartbeat "Problem with $hb: not reachable for $2 seconds, rebooting system!"
+reboot -f
