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: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 16 Feb 2006 08:27:44 -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/cib
Modified Files:
callbacks.c messages.c
Log Message:
Remove the code that wraps answers up in fragments, all clients since 2.0.3
support not having them.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- callbacks.c 15 Feb 2006 13:18:46 -0000 1.109
+++ callbacks.c 16 Feb 2006 15:27:43 -0000 1.110
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.109 2006/02/15 13:18:46 andrew Exp $ */
+/* $Id: callbacks.c,v 1.110 2006/02/16 15:27:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -144,9 +144,6 @@
cib_cleanup_query(const char *op, HA_Message **data, HA_Message **output)
{
CRM_DEV_ASSERT(*data == NULL);
-#if USE_PESKY_FRAGMENTS
- free_xml(*output);
-#endif
return cib_ok;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/messages.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- messages.c 3 Feb 2006 08:29:22 -0000 1.64
+++ messages.c 16 Feb 2006 15:27:43 -0000 1.65
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.64 2006/02/03 08:29:22 andrew Exp $ */
+/* $Id: messages.c,v 1.65 2006/02/16 15:27:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -181,30 +181,8 @@
if(obj_root == NULL) {
result = cib_NOTEXISTS;
-#if USE_PESKY_FRAGMENTS
- } else if(obj_root == existing_cib) {
- crm_xml_add(obj_root, "origin", cib_our_uname);
- *answer = create_xml_node(NULL, XML_TAG_FRAGMENT);
- add_node_copy(*answer, obj_root);
-
- } else {
- crm_data_t *cib = createEmptyCib();
- crm_data_t *query_obj_root = get_object_root(section, cib);
- copy_in_properties(cib, existing_cib);
- crm_xml_add(cib, "origin", cib_our_uname);
-
- xml_child_iter(
- obj_root, an_obj,
- add_node_copy(query_obj_root, an_obj);
- );
-
- *answer = create_xml_node(NULL, XML_TAG_FRAGMENT);
- add_node_copy(*answer, cib);
- free_xml(cib);
-#else
} else {
*answer = obj_root;
-#endif
}
if(result == cib_ok && *answer == NULL) {
@@ -705,15 +683,7 @@
crm_log_xml_err(failed, "CIB Update failures");
}
-#if USE_PESKY_FRAGMENTS
- if (verbose || xml_has_children(failed) || result != cib_ok) {
- *answer = createCibFragmentAnswer(section, failed);
- }
- free_xml(failed);
-#else
*answer = failed;
-#endif
-
return result;
}
------------------------------
Message: 2
Date: Thu, 16 Feb 2006 09:01:33 -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/tengine
Modified Files:
events.c
Log Message:
Downgrade some errors now that we understand them
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- events.c 16 Feb 2006 15:20:32 -0000 1.2
+++ events.c 16 Feb 2006 16:01:33 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.2 2006/02/16 15:20:32 andrew Exp $ */
+/* $Id: events.c,v 1.3 2006/02/16 16:01:33 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -438,7 +438,7 @@
crm_log_xml_debug_2(event, "match:pending");
} else if(rc != -1) {
- crm_err("Search terminated: %d", rc);
+ crm_warn("Search terminated: %d", rc);
abort_transition(INFINITY, tg_restart,
"Unexpected event", event);
}
------------------------------
Message: 3
Date: Thu, 16 Feb 2006 09:01:33 -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/pengine
Modified Files:
utils.c
Log Message:
Downgrade some errors now that we understand them
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- utils.c 15 Feb 2006 13:17:16 -0000 1.124
+++ utils.c 16 Feb 2006 16:01:33 -0000 1.125
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.124 2006/02/15 13:17:16 andrew Exp $ */
+/* $Id: utils.c,v 1.125 2006/02/16 16:01:33 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -787,8 +787,8 @@
if(action->rsc->is_managed
&& save_action
&& a_task == stop_rsc) {
- pe_proc_err("Marking node %s unclean",
- action->node->details->uname);
+ crm_warn("Marking node %s unclean",
+ action->node->details->uname);
action->node->details->unclean = TRUE;
}
------------------------------
Message: 4
Date: Thu, 16 Feb 2006 10:52:59 -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/tengine
Modified Files:
utils.c
Log Message:
BSC Regularly fails on lmb's machine
By the looks of it, a new transition arrives before Gmainloop gets around to
processing our trigger.
So send the notification right away if the transition had already completed.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/utils.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- utils.c 14 Feb 2006 11:40:25 -0000 1.53
+++ utils.c 16 Feb 2006 17:52:58 -0000 1.54
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.53 2006/02/14 11:40:25 andrew Exp $ */
+/* $Id: utils.c,v 1.54 2006/02/16 17:52:58 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -157,9 +157,8 @@
log_level = LOG_INFO;
}
- G_main_set_trigger(transition_trigger);
- update_abort_priority(transition_graph,
- abort_priority, abort_action, abort_text);
+ update_abort_priority(
+ transition_graph, abort_priority, abort_action, abort_text);
crm_log_maybe(log_level, "%s:%d - Triggered graph processing : %s",
fn, line, abort_text);
@@ -167,4 +166,11 @@
if(reason != NULL) {
crm_log_xml(log_level, "Cause", reason);
}
+
+ if(transition_graph->complete) {
+ notify_crmd(transition_graph);
+
+ } else {
+ G_main_set_trigger(transition_trigger);
+ }
}
------------------------------
_______________________________________________
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 70
********************************************
