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: crm by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 3 Apr 2006 09:05:03 -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
Modified Files:
unpack.c
Log Message:
Some compilers dont like #if blocks within macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -3 -r1.177 -r1.178
--- unpack.c 3 Apr 2006 13:24:35 -0000 1.177
+++ unpack.c 3 Apr 2006 15:05:03 -0000 1.178
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.177 2006/04/03 13:24:35 andrew Exp $ */
+/* $Id: unpack.c,v 1.178 2006/04/03 15:05:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -93,12 +93,12 @@
config, "cluster_property_set", NULL, config_hash,
NULL, 0, data_set);
+#if CRM_DEPRECATED_SINCE_2_0_1
xml_child_iter_filter(
config, a_child, XML_CIB_TAG_NVPAIR,
name = crm_element_value(a_child, XML_NVPAIR_ATTR_NAME);
-#if CRM_DEPRECATED_SINCE_2_0_1
value = crm_element_value(a_child, XML_NVPAIR_ATTR_VALUE);
if(g_hash_table_lookup(config_hash, name) == NULL) {
g_hash_table_insert(
@@ -107,12 +107,17 @@
pe_config_err("Creating <nvpair id=%s name=%s/> directly"
"beneath <crm_config> has been depreciated since"
" 2.0.1", ID(a_child), name);
+ );
#else
+ xml_child_iter_filter(
+ config, a_child, XML_CIB_TAG_NVPAIR,
+
+ name = crm_element_value(a_child, XML_NVPAIR_ATTR_NAME);
pe_config_err("Creating <nvpair id=%s name=%s/> directly"
"beneath <crm_config> has been depreciated since"
" 2.0.1 and is now disabled", ID(a_child), name);
-#endif
);
+#endif
get_cluster_pref("transition_idle_timeout");
if(value != NULL) {
------------------------------
Message: 2
Date: Mon, 3 Apr 2006 09:14:56 -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/cib
Modified Files:
io.c
Log Message:
Fix the recovery code when changes aren't valid
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- io.c 3 Apr 2006 09:41:36 -0000 1.55
+++ io.c 3 Apr 2006 15:14:56 -0000 1.56
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.55 2006/04/03 09:41:36 andrew Exp $ */
+/* $Id: io.c,v 1.56 2006/04/03 15:14:56 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -488,17 +488,16 @@
if (initializeCib(new_cib) == FALSE) {
crm_err("Ignoring invalid or NULL CIB");
- error_code = -1;
if(saved_cib != NULL) {
crm_warn("Reverting to last known CIB");
- if (initializeCib(saved_cib)) {
+ if (initializeCib(saved_cib) == FALSE) {
/* oh we are so dead */
crm_crit("Couldn't re-initialize the old CIB!");
cl_flush_logs();
exit(1);
}
- } else if(error_code != cib_ok) {
+ } else {
crm_crit("Could not write out new CIB and no saved"
" version to revert to");
}
------------------------------
Message: 3
Date: Mon, 3 Apr 2006 09:15: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/cib
Modified Files:
messages.c
Log Message:
Limit the scope of deletes and updates when a section name is provided
- also ensures the section itself can't be removed
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- messages.c 3 Apr 2006 10:01:35 -0000 1.71
+++ messages.c 3 Apr 2006 15:15:46 -0000 1.72
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.71 2006/04/03 10:01:35 andrew Exp $ */
+/* $Id: messages.c,v 1.72 2006/04/03 15:15:46 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -562,6 +562,7 @@
const char *op, int options, const char *section, crm_data_t *input,
crm_data_t *existing_cib, crm_data_t **result_cib, crm_data_t **answer)
{
+ crm_data_t *obj_root = NULL;
crm_debug_2("Processing \"%s\" event", op);
if(input == NULL) {
@@ -570,11 +571,12 @@
}
*result_cib = copy_xml(existing_cib);
+ obj_root = get_object_root(section, *result_cib);
crm_validate_data(input);
crm_validate_data(*result_cib);
- if(delete_xml_child(NULL, *result_cib, input) == FALSE) {
+ if(delete_xml_child(NULL, obj_root, input) == FALSE) {
crm_debug_2("No matching object to delete");
}
@@ -588,6 +590,7 @@
const char *op, int options, const char *section, crm_data_t *input,
crm_data_t *existing_cib, crm_data_t **result_cib, crm_data_t **answer)
{
+ crm_data_t *obj_root = NULL;
crm_debug_2("Processing \"%s\" event", op);
if(input == NULL) {
@@ -596,11 +599,12 @@
}
*result_cib = copy_xml(existing_cib);
+ obj_root = get_object_root(section, *result_cib);
crm_validate_data(input);
crm_validate_data(*result_cib);
- if(update_xml_child(*result_cib, input) == FALSE) {
+ if(update_xml_child(obj_root, input) == FALSE) {
return cib_NOTEXISTS;
}
------------------------------
Message: 4
Date: Mon, 3 Apr 2006 09:16:48 -0600 (MDT)
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:
If we matched the search root, keep searching just in case another copy exists
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- xml.c 3 Apr 2006 13:58:49 -0000 1.65
+++ xml.c 3 Apr 2006 15:16:48 -0000 1.66
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.65 2006/04/03 13:58:49 andrew Exp $ */
+/* $Id: xml.c,v 1.66 2006/04/03 15:16:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2082,6 +2082,7 @@
} else if(can_delete) {
crm_log_xml_debug(child, "Cannot delete the search root");
+ can_delete = FALSE;
}
------------------------------
_______________________________________________
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 10
********************************************
