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: crm by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: include by andrew from
([email protected])
5. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 2 Feb 2006 01:56:27 -0700 (MST)
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:
join_client.c
Log Message:
A small fudge to account for a situation that came up once in about 10,000
CTS iterations.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_client.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- join_client.c 17 Jan 2006 13:23:35 -0000 1.37
+++ join_client.c 2 Feb 2006 08:56:27 -0000 1.38
@@ -47,6 +47,7 @@
HA_Message *req = create_request(CRM_OP_JOIN_ANNOUNCE, NULL, NULL,
CRM_SYSTEM_DC, CRM_SYSTEM_CRMD, NULL);
+ sleep(1); /* give the CCM time to propogate to the DC */
crm_debug("Querying for a DC");
send_msg_via_ha(fsa_cluster_conn, req);
@@ -194,7 +195,8 @@
query_call_id = 0;
if(rc == cib_ok) {
- local_cib = find_xml_node(output, XML_TAG_CIB, TRUE);
+ local_cib = output;
+ CRM_DEV_ASSERT(safe_str_eq(crm_element_name(output),
XML_TAG_CIB));
}
if(local_cib != NULL) {
------------------------------
Message: 2
Date: Thu, 2 Feb 2006 01:57:07 -0700 (MST)
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:
join_client.c
Log Message:
Only part of the pervious commit was supposed to go in.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_client.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- join_client.c 2 Feb 2006 08:56:27 -0000 1.38
+++ join_client.c 2 Feb 2006 08:57:07 -0000 1.39
@@ -195,8 +195,7 @@
query_call_id = 0;
if(rc == cib_ok) {
- local_cib = output;
- CRM_DEV_ASSERT(safe_str_eq(crm_element_name(output),
XML_TAG_CIB));
+ local_cib = find_xml_node(output, XML_TAG_CIB, TRUE);
}
if(local_cib != NULL) {
------------------------------
Message: 3
Date: Thu, 2 Feb 2006 01:58:59 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Further spped up the non-dev case by inlining the check for non-NULL.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- xml.c 2 Feb 2006 08:33:14 -0000 1.54
+++ xml.c 2 Feb 2006 08:58:58 -0000 1.55
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.54 2006/02/02 08:33:14 andrew Exp $ */
+/* $Id: xml.c,v 1.55 2006/02/02 08:58:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -924,13 +924,9 @@
return FALSE;
}
-
void
-crm_validate_data(const crm_data_t *xml_root)
+xml_validate(const crm_data_t *xml_root)
{
-#ifndef XML_PARANOIA_CHECKS
- CRM_DEV_ASSERT(xml_root != NULL);
-#else
int lpc = 0;
CRM_ASSERT(xml_root != NULL);
CRM_ASSERT(cl_is_allocated(xml_root) == 1);
@@ -952,7 +948,6 @@
/* CRM_DEV_ASSERT(FALSE); */
}
}
-#endif
}
------------------------------
Message: 4
Date: Thu, 2 Feb 2006 01:58:59 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm/common
Modified Files:
xml.h
Log Message:
Further spped up the non-dev case by inlining the check for non-NULL.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/xml.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- xml.h 2 Feb 2006 08:33:14 -0000 1.39
+++ xml.h 2 Feb 2006 08:58:58 -0000 1.40
@@ -1,4 +1,4 @@
-/* $Id: xml.h,v 1.39 2006/02/02 08:33:14 andrew Exp $ */
+/* $Id: xml.h,v 1.40 2006/02/02 08:58:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -34,6 +34,8 @@
/* #define USE_LIBXML 1 */
#if CRM_DEV_BUILD
# define XML_PARANOIA_CHECKS 1
+#else
+# define XML_PARANOIA_CHECKS 0
#endif
#ifdef USE_LIBXML
@@ -235,14 +237,20 @@
extern const char *crm_element_name(const crm_data_t *data);
-extern void crm_validate_data(const crm_data_t *root);
+extern void xml_validate(const crm_data_t *root);
extern void crm_update_parents(crm_data_t *root);
extern gboolean xml_has_children(crm_data_t *root);
-# define xmlGetNodePath(data) crm_element_value(data, XML_ATTR_TAGNAME)
-# define xml_child_iter(parent, child, loop_code) \
+#if XML_PARANOIA_CHECKS
+# define crm_validate_data(obj) xml_validate(obj)
+#else
+# define crm_validate_data(obj) CRM_DEV_ASSERT(obj != NULL)
+#endif
+
+#define xmlGetNodePath(data) crm_element_value(data, XML_ATTR_TAGNAME)
+#define xml_child_iter(parent, child, loop_code) \
if(parent != NULL) { \
int __counter = 0; \
crm_data_t *child = NULL; \
------------------------------
Message: 5
Date: Thu, 2 Feb 2006 01:59:53 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/cib
Modified Files:
cib_native.c
Log Message:
Disable currently useless code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_native.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- cib_native.c 26 Jan 2006 10:24:06 -0000 1.52
+++ cib_native.c 2 Feb 2006 08:59:52 -0000 1.53
@@ -370,6 +370,7 @@
}
#endif
if(rc == HA_OK && data != NULL) {
+#if 0
const char *tag = crm_element_name(data);
crm_data_t *cib = data;
if(safe_str_neq(tag, XML_TAG_CIB)) {
@@ -378,7 +379,6 @@
tag = XML_TAG_CIB;
}
}
-#if 0
if(safe_str_eq(tag, XML_TAG_CIB)) {
const char *version = feature_set(cib);
crm_xml_add(cib, XML_ATTR_CIB_REVISION, version);
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 5
*******************************************
