Gitweb:
http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=e6d4bcebbb9...
Commit: e6d4bcebbb938d17a5a6b31b465922ac1787229e
Parent: 44f44766b02d5b16b9345d37d58d9184ab423889
Author: Ryan McCabe <rmccabe(a)redhat.com>
AuthorDate: Thu Mar 13 13:38:05 2014 -0400
Committer: Ryan McCabe <rmccabe(a)redhat.com>
CommitterDate: Thu Mar 13 13:38:05 2014 -0400
rgmanager: vm.sh: Allow "timeout" to be specified for Xen VMs
Allow "timeout" to be specified when using the xm command to
match the behavior when using the virsh command.
Patch from Raphaƫl Enrici <raphael(a)root-42.com>
Resolves: rhbz#924694
Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com>
---
rgmanager/src/resources/vm.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 7310da3..f98356f 100755
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -417,7 +417,7 @@ do_virsh_start()
do_xm_stop()
{
- declare -i timeout=60
+ declare -i timeout=$(get_timeout)
declare -i ret=1
declare st
@@ -425,7 +425,7 @@ do_xm_stop()
echo "CMD: xm $op $OCF_RESKEY_name"
xm $op $OCF_RESKEY_name
- timeout=60
+ timeout=$(get_timeout)
while [ $timeout -gt 0 ]; do
sleep 5
((timeout -= 5))