resource-agents: master - vm.sh: Fix return codes

Lon Hohberger lon at fedoraproject.org
Tue Dec 1 15:33:50 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=848e522a760d661e674705ebd7a2a1bc4f7e08c9
Commit:        848e522a760d661e674705ebd7a2a1bc4f7e08c9
Parent:        ba998d71e22a688170c9c30b0b889b92c141e997
Author:        Federico Simoncelli <federico.simoncelli at gmail.com>
AuthorDate:    Tue Dec 1 10:32:59 2009 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Dec 1 10:32:59 2009 -0500

vm.sh: Fix return codes

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/vm.sh |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 9f8647a..3ec8b87 100644
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -812,17 +812,11 @@ virsh_migrate()
 		ocf_log err "$err"
 
 		if [ "$err" != "${err/does not exist/}" ]; then
-			return $OCF_NOT_RUNNING
+			return $OCF_ERR_CONFIGURED
 		fi
 		if [ "$err" != "${err/Domain not found/}" ]; then
-			return $OCF_NOT_RUNNING
-		fi
-		if [ "$err" != "${err/Connection refused/}" ]; then
 			return $OCF_ERR_CONFIGURED
 		fi
-		if [ "$err" != "${err/unable to start guest/}" ]; then
-			return $OCF_NOT_RUNNING
-		fi
 
 		return $OCF_ERR_GENERIC
 	fi
@@ -940,11 +934,9 @@ case $1 in
 			# If the VM is still in good health, return
 			# a value to rgmanager to indicate the 
 			# non-critical error
-			#
-			# XXX Is OCF_ERR_CONFIGURED the right value?
 			do_status > /dev/null
 			if [ $? -eq 0 ]; then
-				rv=$OCF_ERR_CONFIGURED
+				rv=$OCF_NOT_RUNNING
 			fi
 		fi
 		exit $rv


More information about the cluster-commits mailing list