[Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
rmccabe at sourceware.org
rmccabe at sourceware.org
Thu Mar 8 06:04:12 UTC 2007
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-03-08 06:04:12
Modified files:
ricci/modules/cluster: Clusvcadm.cpp
Log message:
prepend 'vm:' to rgmanager vm service names when issuing clusvcadm commands
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Clusvcadm.cpp.diff?cvsroot=cluster&r1=1.8&r2=1.9
--- conga/ricci/modules/cluster/Clusvcadm.cpp 2006/10/24 14:56:56 1.8
+++ conga/ricci/modules/cluster/Clusvcadm.cpp 2007/03/08 06:04:12 1.9
@@ -80,6 +80,7 @@
pair<list<String>, list<ServiceStatus> > info = service_states();
list<String> nodes = info.first;
list<ServiceStatus> services = info.second;
+ String svcname = servicename;
// check if node can run services
bool node_found = false;
@@ -105,9 +106,10 @@
flag = "-e";
else if (iter->status == ServiceStatus::RG_STATE_STARTED ||
iter->status == ServiceStatus::RG_STATE_STARTING) {
- if (iter->vm)
+ if (iter->vm) {
flag = "-M";
- else
+ svcname = "vm:" + servicename;
+ } else
flag = "-r";
}
@@ -116,7 +118,7 @@
int status;
vector<String> args;
args.push_back(flag);
- args.push_back(servicename);
+ args.push_back(svcname);
if (nodename.size()) {
args.push_back("-m");
args.push_back(nodename);
More information about the Cluster-devel
mailing list