Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
([email protected])
2. Linux-HA CVS: cts by andrew from
([email protected])
3. Linux-HA CVS: tools by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 20 Apr 2006 04:55:46 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine/testcases
Modified Files:
target-1.dot
Log Message:
start/promote ordering
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/target-1.dot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- target-1.dot 3 Apr 2006 10:41:27 -0000 1.1
+++ target-1.dot 20 Apr 2006 10:55:46 -0000 1.2
@@ -24,5 +24,6 @@
"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
"rsc_c001n03_monitor_5000 c001n03" -> "rsc_c001n03_promote_0 c001n03" [ style
= bold]
+"rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_promote_0 c001n03" [ style =
dashed]
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
}
------------------------------
Message: 2
Date: Thu, 20 Apr 2006 04:56:32 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTS.py.in
Log Message:
Allow node state discovery
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTS.py.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- CTS.py.in 19 Apr 2006 16:16:56 -0000 1.58
+++ CTS.py.in 20 Apr 2006 10:56:32 -0000 1.59
@@ -532,6 +532,7 @@
self.log("Second WaitForNodeToComeUp %s failed" % node)
return 0
+ self.ShouldBeStatus[node] = "any"
if self.StataCM(node) and self.cluster_stable(self["DeadTime"]):
self.log ("%s was already started" %(node))
return 1
@@ -642,12 +643,12 @@
try:
if ret:
- if self.ShouldBeStatus[node] != self["up"]:
+ if self.ShouldBeStatus[node] == self["down"]:
self.log(
"Node status for %s is %s but we think it should be %s"
% (node, self["up"], self.ShouldBeStatus[node]))
else:
- if self.ShouldBeStatus[node] != self["down"]:
+ if self.ShouldBeStatus[node] == self["up"]:
self.log(
"Node status for %s is %s but we think it should be %s"
% (node, self["down"], self.ShouldBeStatus[node]))
------------------------------
Message: 3
Date: Thu, 20 Apr 2006 04:58:54 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
haresources2cib.py.in
Log Message:
Patch from Dejan Muhamedagic
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/haresources2cib.py.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- haresources2cib.py.in 19 Apr 2006 15:49:19 -0000 1.11
+++ haresources2cib.py.in 20 Apr 2006 10:58:54 -0000 1.12
@@ -167,6 +167,7 @@
if params != None and len(params) != 0:
instance_attributes = doc.createElement("instance_attributes")
+ instance_attributes.setAttribute("id", id + "_inst_attr")
resource.appendChild(instance_attributes)
attributes = doc.createElement("attributes")
instance_attributes.appendChild(attributes)
@@ -238,6 +239,7 @@
resource_clone = doc.createElement("clone")
resource_clone.setAttribute("id",id)
instance_attributes = doc.createElement("instance_attributes")
+ instance_attributes.setAttribute("id", id + "_inst_attr")
resource_clone.appendChild(instance_attributes)
attributes = doc.createElement("attributes")
instance_attributes.appendChild(attributes)
@@ -301,6 +303,7 @@
start_op.setAttribute("prereq", "nothing")
if len(params) > 2 :
instance_attributes = doc.createElement("instance_attributes")
+ instance_attributes.setAttribute("id", id + "_inst_attr")
resource.appendChild(instance_attributes)
attributes = doc.createElement("attributes")
instance_attributes.appendChild(attributes)
------------------------------
Message: 4
Date: Thu, 20 Apr 2006 05:03:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
cib.c
Log Message:
In the end, this is cheaper than stalling the FSa, setting a timer,
having it expire, cleaning it up... etc etc. The CIB is probably just
a little slow in starting up.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/cib.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- cib.c 7 Apr 2006 15:38:13 -0000 1.50
+++ cib.c 20 Apr 2006 11:03:34 -0000 1.51
@@ -160,6 +160,8 @@
}
if(action & start_actions) {
+ int rc = cib_ok;
+
if(fsa_cib_conn == NULL) {
fsa_cib_conn = cib_new();
}
@@ -169,15 +171,20 @@
this_subsys->name);
return I_NULL;
}
+
+ rc = fsa_cib_conn->cmds->signon(
+ fsa_cib_conn, CRM_SYSTEM_CRMD, cib_command);
+
+ if(rc != cib_ok) {
+ /* a short wait that usually avoids stalling the FSA */
+ sleep(1);
+ rc = fsa_cib_conn->cmds->signon(
+ fsa_cib_conn, CRM_SYSTEM_CRMD, cib_command);
+ }
- if(cib_ok != fsa_cib_conn->cmds->signon(
- fsa_cib_conn, CRM_SYSTEM_CRMD, cib_command)){
+ if(rc != cib_ok){
crm_debug("Could not connect to the CIB service");
-#if 0
- } else if(cib_ok != fsa_cib_conn->cmds->set_op_callback(
- fsa_cib_conn, crmd_cib_op_callback)) {
- crm_err("Could not set op callback");
-#endif
+
} else if(cib_ok != fsa_cib_conn->cmds->set_connection_dnotify(
fsa_cib_conn, crmd_cib_connection_destroy)) {
crm_err("Could not set dnotify callback");
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 106
*********************************************
