Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Fri, 7 Jul 2006 15:26:29 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/cib
Modified Files:
main.c
Log Message:
Only deallocate the CIB at startup when we're in per-action mode
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- main.c 7 Jul 2006 20:59:30 -0000 1.53
+++ main.c 7 Jul 2006 21:26:29 -0000 1.54
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.53 2006/07/07 20:59:30 andrew Exp $ */
+/* $Id: main.c,v 1.54 2006/07/07 21:26:29 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -529,7 +529,9 @@
if(activateCibXml(cib, filename) == 0) {
active = TRUE;
crm_info("CIB Initialization completed successfully");
- uninitializeCib();
+ if(per_action_cib) {
+ uninitializeCib();
+ }
}
return active;
------------------------------
Message: 2
Date: Sat, 8 Jul 2006 07:45:23 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/cib
Modified Files:
callbacks.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -3 -r1.137 -r1.138
--- callbacks.c 7 Jul 2006 20:47:24 -0000 1.137
+++ callbacks.c 8 Jul 2006 13:45:23 -0000 1.138
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.137 2006/07/07 20:47:24 andrew Exp $ */
+/* $Id: callbacks.c,v 1.138 2006/07/08 13:45:23 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -961,8 +961,8 @@
/* keep track of the request so we can time it
* out if required
*/
- crm_err("Registering delegated call from %s",
- cib_client->id);
+ crm_debug_2("Registering delegated call from %s",
+ cib_client->id);
cib_client->delegated_calls = g_list_append(
cib_client->delegated_calls, forward_msg);
forward_msg = NULL;
------------------------------
Message: 3
Date: Sat, 8 Jul 2006 07:49:03 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Broadcast diffs were failing because the input diffs contained version
details which were absent from the generated diff.
This is the case because we changed how diffs were applied in messages.c
to support user diffs (as opposed to system generated ones)
We dont care about these values at this point of the process, so if they
are set for the input diff, copy them to the generated one.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- xml.c 7 Jul 2006 20:53:19 -0000 1.99
+++ xml.c 8 Jul 2006 13:49:03 -0000 1.100
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.99 2006/07/07 20:53:19 andrew Exp $ */
+/* $Id: xml.c,v 1.100 2006/07/08 13:49:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1648,11 +1648,36 @@
result = FALSE;
} else if(result) {
+ int lpc = 0;
crm_data_t *intermediate = NULL;
crm_data_t *diff_of_diff = NULL;
+ crm_data_t *calc_added = NULL;
+ crm_data_t *calc_removed = NULL;
+
+ const char *value = NULL;
+ const char *name = NULL;
+ const char *version_attrs[] = {
+ XML_ATTR_NUMUPDATES,
+ XML_ATTR_GENERATION,
+ XML_ATTR_GENERATION_ADMIN
+ };
crm_debug_2("Verification Phase");
intermediate = diff_xml_object(old, *new, FALSE);
+ calc_added = find_xml_node(intermediate, "diff-added", FALSE);
+ calc_removed = find_xml_node(intermediate, "diff-removed",
FALSE);
+
+ /* add any version details to the diff so they match */
+ for(lpc = 0; lpc < DIMOF(version_attrs); lpc++) {
+ name = version_attrs[lpc];
+
+ value = crm_element_value(added, name);
+ crm_xml_add(calc_added, name, value);
+
+ value = crm_element_value(removed, name);
+ crm_xml_add(calc_removed, name, value);
+ }
+
diff_of_diff = diff_xml_object(intermediate, diff, TRUE);
if(diff_of_diff != NULL) {
crm_notice("Diff application failed!");
@@ -1662,6 +1687,7 @@
log_xml_diff(LOG_INFO, intermediate,
"diff:actual_diff");
result = FALSE;
}
+
free_xml(diff_of_diff);
free_xml(intermediate);
diff_of_diff = NULL;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 35
********************************************
