You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/02/25 21:46:46 UTC
[42/50] [abbrv] git commit: refs/heads/vim51_win8 - Commit review 9586
Commit review 9586
Signed-off-by: Hugo Trippaers <ht...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c30da358
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c30da358
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c30da358
Branch: refs/heads/vim51_win8
Commit: c30da358116ec79e7b84c99c01a22a374de45037
Parents: 6675d2c
Author: Brenn Oosterbaan <bo...@schubergphilis.com>
Authored: Mon Feb 25 14:38:13 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Feb 25 14:40:15 2013 +0100
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 46 +++++++++++++-----
1 files changed, 34 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c30da358/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
index 9cf2afe..5edacf7 100755
--- 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