From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 12 Mar 2007 03:46:20 -0000
Subject: [Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
Message-ID: <20070312034620.10944.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-03-12 03:46:20

Modified files:
	ricci/modules/cluster: Clusvcadm.cpp 

Log message:
	Fix a bug that caused service relocation to fail.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Clusvcadm.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.8.2.3&r2=1.8.2.4

--- conga/ricci/modules/cluster/Clusvcadm.cpp	2007/03/10 05:01:19	1.8.2.3
+++ conga/ricci/modules/cluster/Clusvcadm.cpp	2007/03/12 03:46:20	1.8.2.4
@@ -108,9 +108,8 @@
 	  iter->status == ServiceStatus::RG_STATE_DISABLED)
 	flag = "-e";
       else if (iter->status == ServiceStatus::RG_STATE_STARTED ||
-	       iter->status == ServiceStatus::RG_STATE_STARTING) {
-	} else
-	  flag = "-r";
+	       iter->status == ServiceStatus::RG_STATE_STARTING)
+	flag = "-r";
       
       if (flag.size()) {
 	String out, err;
@@ -170,9 +169,8 @@
 	  iter->status == ServiceStatus::RG_STATE_DISABLED)
 	flag = "-e";
       else if (iter->status == ServiceStatus::RG_STATE_STARTED ||
-	       iter->status == ServiceStatus::RG_STATE_STARTING) {
+	       iter->status == ServiceStatus::RG_STATE_STARTING)
 	flag = "-M";
-      }
       
       if (flag.size()) {
 	String out, err;
@@ -242,6 +240,8 @@
       String flag;
       if (iter->status == ServiceStatus::RG_STATE_MIGRATE)
          throw String(servicename + " is in the process of being migrated");
+      if (iter->status == ServiceStatus::RG_STATE_STARTING)
+         throw String(servicename + " is in the process of being started");
 
       if (iter->status == ServiceStatus::RG_STATE_STOPPED ||
 	  iter->status == ServiceStatus::RG_STATE_STOPPING ||