[Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
rmccabe at sourceware.org
rmccabe at sourceware.org
Mon Mar 12 03:45:58 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-03-12 03:45:57
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=RHEL5&r1=1.7.2.4&r2=1.7.2.5
--- conga/ricci/modules/cluster/Clusvcadm.cpp 2007/03/10 05:00:34 1.7.2.4
+++ conga/ricci/modules/cluster/Clusvcadm.cpp 2007/03/12 03:45:57 1.7.2.5
@@ -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 ||
More information about the Cluster-devel
mailing list