* [Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
@ 2007-03-08 6:05 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-03-08 6:05 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-03-08 06:05:08
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&only_with_tag=RHEL5&r1=1.7.2.1&r2=1.7.2.2
--- conga/ricci/modules/cluster/Clusvcadm.cpp 2006/10/24 14:31:40 1.7.2.1
+++ conga/ricci/modules/cluster/Clusvcadm.cpp 2007/03/08 06:05:08 1.7.2.2
@@ -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);
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
@ 2007-03-12 3:46 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-03-12 3:46 UTC (permalink / raw)
To: cluster-devel.redhat.com
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 ||
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
@ 2007-03-12 3:45 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-03-12 3:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
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 ||
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
@ 2007-03-12 3:45 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-03-12 3:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-03-12 03:45:19
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&r1=1.11&r2=1.12
--- conga/ricci/modules/cluster/Clusvcadm.cpp 2007/03/10 04:57:47 1.11
+++ conga/ricci/modules/cluster/Clusvcadm.cpp 2007/03/12 03:45:18 1.12
@@ -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 ||
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
@ 2007-03-08 6:04 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-03-08 6:04 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-03-08 06:04:39
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&only_with_tag=RHEL4&r1=1.8&r2=1.8.2.1
--- 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:39 1.8.2.1
@@ -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);
^ permalink raw reply [flat|nested] 6+ messages in thread* [Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp
@ 2007-03-08 6:04 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-03-08 6:04 UTC (permalink / raw)
To: cluster-devel.redhat.com
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);
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-03-12 3:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-08 6:05 [Cluster-devel] conga/ricci/modules/cluster Clusvcadm.cpp rmccabe
-- strict thread matches above, loose matches on Subject: below --
2007-03-12 3:46 rmccabe
2007-03-12 3:45 rmccabe
2007-03-12 3:45 rmccabe
2007-03-08 6:04 rmccabe
2007-03-08 6:04 rmccabe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).