From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-11748-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 1080 invoked by alias); 28 Aug 2009 14:15:20 -0000
Received: (qmail 1067 invoked by alias); 28 Aug 2009 14:15:19 -0000
X-SWARE-Spam-Status: No, hits=-2.1 required=5.0
	tests=AWL,BAYES_00,SPF_HELO_PASS
X-Spam-Status: No, hits=-2.1 required=5.0
	tests=AWL,BAYES_00,SPF_HELO_PASS
X-Spam-Check-By: sourceware.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	bastion2.fedora.phx.redhat.com
Subject: cluster: STABLE3 - rgmanager: Handle virsh migration errors gracefully
To: cluster-cvs-relay@redhat.com
X-Project: Cluster Project
X-Git-Module: cluster.git
X-Git-Refname: refs/heads/STABLE3
X-Git-Reftype: branch
X-Git-Oldrev: 99523832873365b01ae8414421d3709b3fe1dc90
X-Git-Newrev: 84e6a86ece412ab4ccf86541813c51961d23b9bf
From: Lon Hohberger <lon@fedoraproject.org>
Message-Id: <20090828141453.3EBB0120285@lists.fedorahosted.org>
Date: Fri, 28 Aug 2009 14:15:00 -0000
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2009-q3/txt/msg00245.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=84e6a86ece412ab4ccf86541813c51961d23b9bf
Commit:        84e6a86ece412ab4ccf86541813c51961d23b9bf
Parent:        99523832873365b01ae8414421d3709b3fe1dc90
Author:        Federico Simoncelli <federico.simoncelli@gmail.com>
AuthorDate:    Fri Aug 28 10:06:58 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Aug 28 10:06:58 2009 -0400

rgmanager: Handle virsh migration errors gracefully

Signed-off-by: Federico Simoncelli <federico.simoncelli@gmail.com>
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/resources/vm.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index 0d3173c..2dbeb5b 100644
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -688,6 +688,9 @@ virsh_migrate()
 		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