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: debian by horms from
([email protected])
2. Linux-HA CVS: debian by horms from
([email protected])
3. Linux-HA CVS: doc by horms from ([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 3 Feb 2006 00:27:09 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
Tag: STABLE_1_2
changelog
Log Message:
Debian Packaging
Add entry for #35120
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.17.2.33
retrieving revision 1.17.2.34
diff -u -3 -r1.17.2.33 -r1.17.2.34
--- changelog 3 Feb 2006 02:10:48 -0000 1.17.2.33
+++ changelog 3 Feb 2006 07:27:09 -0000 1.17.2.34
@@ -2,8 +2,10 @@
* Make /usr/bin/cl_status setgid
(closes: #351180)
+ * Fix inconsistency between hb_standb(1) man page and wiki
+ (closes: #351202)
- -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 11:10:00 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 16:26:00 +0900
heartbeat (1.2.4-2) unstable; urgency=low
------------------------------
Message: 2
Date: Fri, 3 Feb 2006 00:29:08 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
changelog
Log Message:
Debian Packaging
Add entry for #339016
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- changelog 3 Feb 2006 02:23:32 -0000 1.55
+++ changelog 3 Feb 2006 07:29:07 -0000 1.56
@@ -30,8 +30,10 @@
* Make sure that /var/run/heartbeat/{ccm,crm} exist on install
else postinst, and thus the install will abort.
(closes: #351181)
+ * Fix inconsistency between hb_standb(1) man page and wiki
+ (closes: #339016)
- -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 11:21:53 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 16:27:11 +0900
heartbeat-2 (2.0.2-5) unstable; urgency=low
------------------------------
Message: 3
Date: Fri, 3 Feb 2006 00:29:56 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: doc by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : doc
Dir : linux-ha/doc
Modified Files:
Tag: STABLE_1_2
hb_standby.1
Log Message:
Previous fix should be r0 and r1, not d0 and d0
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/doc/hb_standby.1,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- hb_standby.1 3 Feb 2006 01:34:08 -0000 1.1.2.2
+++ hb_standby.1 3 Feb 2006 07:29:56 -0000 1.1.2.3
@@ -16,9 +16,9 @@
The meaning of the options is relative. For this sample haresources file:
-nodea drbddisk::d0 Filesystem::/dev/drbd0::/local/groups::ext3 10.0.0.1 smb
+nodea drbddisk::r0 Filesystem::/dev/drbd0::/local/groups::ext3 10.0.0.1 smb
-nodeb drbddisk::d1 Filesystem::/dev/drbd1::/local/ldap::ext3 10.0.0.2 ldap
+nodeb drbddisk::r1 Filesystem::/dev/drbd1::/local/ldap::ext3 10.0.0.2 ldap
.TP
\fBhb_standby local\fP
------------------------------
Message: 4
Date: Fri, 3 Feb 2006 01:29:22 -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:
ccm.c cib.c join_client.c pengine.c
Log Message:
Wrapping the contents of the CIB into "<cib_fragment>"s makes processing
harder/annoying and is quite wasteful in CPU-terms.
2.0.4 will remove this behaviour USE_PESKY_FRAGMENTS and these changes
will allow 2.0.3 to support both behaviours (and thus allow rolling upgrades)
The server already supports both cases (since 2.0.2), this set of updates
affects clients of the CIB.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/ccm.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- ccm.c 11 Jan 2006 12:55:20 -0000 1.93
+++ ccm.c 3 Feb 2006 08:29:22 -0000 1.94
@@ -1,4 +1,4 @@
-/* $Id: ccm.c,v 1.93 2006/01/11 12:55:20 andrew Exp $ */
+/* $Id: ccm.c,v 1.94 2006/02/03 08:29:22 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -601,7 +601,17 @@
crm_xml_add(fragment, XML_ATTR_SECTION, XML_CIB_TAG_STATUS);
}
- tmp = find_xml_node(fragment, XML_TAG_CIB, TRUE);
+#if CRM_DEPRECATED_SINCE_2_0_4
+ if(safe_str_eq(crm_element_name(fragment), XML_TAG_CIB)) {
+ tmp = fragment;
+ } else {
+ tmp = find_xml_node(fragment, XML_TAG_CIB, TRUE);
+ }
+#else
+ tmp = fragment;
+ CRM_DEV_ASSERT(safe_str_eq(crm_element_name(tmp), XML_TAG_CIB));
+#endif
+
tmp = get_object_root(XML_CIB_TAG_STATUS, tmp);
CRM_DEV_ASSERT(tmp != NULL);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/cib.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- cib.c 11 Jan 2006 13:06:11 -0000 1.44
+++ cib.c 3 Feb 2006 08:29:22 -0000 1.45
@@ -60,8 +60,18 @@
{
int cmp = -1;
const char *revision = NULL;
- crm_data_t *generation = find_xml_node(output, XML_TAG_CIB, TRUE);
-
+ crm_data_t *generation = NULL;
+#if CRM_DEPRECATED_SINCE_2_0_4
+ if(safe_str_eq(crm_element_name(output), XML_TAG_CIB)) {
+ generation = output;
+ } else {
+ generation = find_xml_node(output, XML_TAG_CIB, TRUE);
+ }
+#else
+ generation = output;
+ CRM_DEV_ASSERT(safe_str_eq(crm_element_name(generation), XML_TAG_CIB));
+#endif
+
if(rc != cib_ok) {
fsa_data_t *msg_data = NULL;
register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_client.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- join_client.c 2 Feb 2006 08:57:07 -0000 1.39
+++ join_client.c 3 Feb 2006 08:29:22 -0000 1.40
@@ -195,7 +195,16 @@
query_call_id = 0;
if(rc == cib_ok) {
- local_cib = find_xml_node(output, XML_TAG_CIB, TRUE);
+#if CRM_DEPRECATED_SINCE_2_0_4
+ if(safe_str_eq(crm_element_name(output), XML_TAG_CIB)) {
+ local_cib = output;
+ } else {
+ local_cib = find_xml_node(output, XML_TAG_CIB, TRUE);
+ }
+#else
+ local_cib = output;
+ CRM_DEV_ASSERT(safe_str_eq(crm_element_name(local_cib),
XML_TAG_CIB));
+#endif
}
if(local_cib != NULL) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/pengine.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- pengine.c 25 Oct 2005 14:02:14 -0000 1.36
+++ pengine.c 3 Feb 2006 08:29:22 -0000 1.37
@@ -159,8 +159,17 @@
HA_Message *cmd = NULL;
int ccm_transition_id = -1;
gboolean cib_has_quorum = FALSE;
- crm_data_t *local_cib = find_xml_node(output, XML_TAG_CIB, TRUE);
-
+ crm_data_t *local_cib = NULL;
+
+#if CRM_DEPRECATED_SINCE_2_0_4
+ if(safe_str_eq(crm_element_name(output), XML_TAG_CIB)) {
+ local_cib = output;
+ } else {
+ local_cib = find_xml_node(output, XML_TAG_CIB, TRUE);
+ }
+#else
+ local_cib = output;
+#endif
if(call_id != fsa_pe_query) {
crm_debug_2("Skipping superceeded CIB query: %d (current=%d)",
call_id, fsa_pe_query);
------------------------------
_______________________________________________
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 18
********************************************
