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: cts 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) 4. Linux-HA CVS: crm by andrew from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Fri, 23 Jun 2006 02:33:54 -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/tengine Modified Files: callbacks.c Log Message: Pass the potentially very large TE graph around as a pointer to a file on disk to avoid IPC size limitations in larger (#nodes and/or #resources) clusters. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -3 -r1.83 -r1.84 --- callbacks.c 6 Jun 2006 20:59:17 -0000 1.83 +++ callbacks.c 23 Jun 2006 08:33:53 -0000 1.84 @@ -1,4 +1,4 @@ -/* $Id: callbacks.c,v 1.83 2006/06/06 20:59:17 andrew Exp $ */ +/* $Id: callbacks.c,v 1.84 2006/06/23 08:33:53 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -229,20 +229,34 @@ return TRUE; } else if(strcasecmp(op, CRM_OP_TRANSITION) == 0) { + const char *graph_file = cl_get_string(msg, F_CRM_TGRAPH); +/* const char *graph_input = cl_get_string(msg, F_CRM_TGRAPH_INPUT); */ + CRM_CHECK(graph_file != NULL, crm_err("No graph filename provided"); return TRUE); + if(transition_graph->complete == FALSE) { crm_info("Another transition is already active"); abort_transition( INFINITY,tg_restart,"Transition Active",NULL); } else { + FILE *graph_fd = fopen(graph_file, "r"); + crm_data_t *graph_data = file2xml(graph_fd); + CRM_CHECK(graph_fd != NULL, + crm_err("Could not open graph filename: %s", graph_file); + return TRUE); + destroy_graph(transition_graph); - transition_graph = unpack_graph(xml_data); + crm_debug("Read graph from: %s", graph_file); + transition_graph = unpack_graph(graph_data); start_global_timer(transition_timer, transition_graph->transition_timeout); trigger_graph(); print_graph(LOG_DEBUG_2, transition_graph); + fclose(graph_fd); + free_xml(graph_data); } - + unlink(graph_file); + } else if(strcasecmp(op, CRM_OP_TE_HALT) == 0) { abort_transition(INFINITY, tg_stop, "Peer Halt", NULL); ------------------------------ Message: 2 Date: Fri, 23 Jun 2006 02:34:09 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : cts Dir : linux-ha/cts Modified Files: CIB.py.in Log Message: Add some newer options =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- CIB.py.in 29 May 2006 09:36:48 -0000 1.15 +++ CIB.py.in 23 Jun 2006 08:34:09 -0000 1.16 @@ -16,18 +16,20 @@ cib_option_template = ''' <cluster_property_set id="cib-bootstrap-options"> <attributes> - <nvpair id="cib-bootstrap-options-transition_idle_timeout" name="transition_idle_timeout" value="3m"/> + <nvpair id="cib-bootstrap-options-default_action_timeout" name="default_action_timeout" value="3m"/> <nvpair id="cib-bootstrap-options-symmetric_cluster" name="symmetric_cluster" value="true"/> <nvpair id="cib-bootstrap-options-stop_orphan_resources" name="stop_orphan_resources" value="true"/> <nvpair id="cib-bootstrap-options-stop_orphan_actions" name="stop_orphan_actions" value="true"/> <nvpair id="cib-bootstrap-options-remove_after_stop" name="remove_after_stop" value="false"/> <nvpair id="cib-bootstrap-options-is_managed_default" name="is_managed_default" value="true"/> <nvpair id="cib-bootstrap-options-no_quorum_policy" name="no_quorum_policy" value="stop"/> - <nvpair id="cib-bootstrap-options-default_resource_stickiness" name="default_resource_stickiness" value="0"/> + <nvpair id="cib-bootstrap-options-stonith_action" name="stonith_action" value="reboot"/> <nvpair id="cib-bootstrap-options-stonith_enabled" name="stonith_enabled" value="%d"/> <nvpair id="cib-bootstrap-options-pe-error-series-max" name="pe-error-series-max" value="-1"/> <nvpair id="cib-bootstrap-options-pe-warn-series-max" name="pe-warn-series-max" value="-1"/> <nvpair id="cib-bootstrap-options-pe-input-series-max" name="pe-input-series-max" value="-1"/> + <nvpair id="cib-bootstrap-options-default_resource_stickiness" name="default_resource_stickiness" value="0"/> + <nvpair id="cib-bootstrap-options-default_resource_failure_stickiness" name="default_resource_failure_stickiness" value="0"/> </attributes> </cluster_property_set>''' ------------------------------ Message: 3 Date: Fri, 23 Jun 2006 02:53:46 -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: utils.c Log Message: Cleanup of crm_assert() to be more informative =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- utils.c 29 May 2006 13:21:14 -0000 1.56 +++ utils.c 23 Jun 2006 08:53:45 -0000 1.57 @@ -1,4 +1,4 @@ -/* $Id: utils.c,v 1.56 2006/05/29 13:21:14 andrew Exp $ */ +/* $Id: utils.c,v 1.57 2006/06/23 08:53:45 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -1215,15 +1215,18 @@ { int pid = 0; - do_crm_log(LOG_ERR, file, function, - "Triggered %sfatal assert at %s:%d : %s", - do_fork?"non-":"", file, line, assert_condition); - - if(do_fork && crm_log_level < LOG_DEBUG) { + if(do_fork == FALSE) { + do_crm_log(LOG_ERR, file, function, + "Triggered fatal assert at %s:%d : %s", + file, line, assert_condition); + + } else if(crm_log_level < LOG_DEBUG) { + do_crm_log(LOG_ERR, file, function, + "Triggered non-fatal assert at %s:%d : %s", + file, line, assert_condition); return; - } - - if(do_fork) { + + } else { pid=fork(); } @@ -1233,7 +1236,9 @@ return; default: /* Parent */ - crm_debug("Child %d forked to record assert failure", pid); + do_crm_log(LOG_ERR, file, function, + "Forked child %d to record non-fatal assert at %s:%d : %s", + pid, file, line, assert_condition); return; case 0: /* Child */ ------------------------------ Message: 4 Date: Fri, 23 Jun 2006 02:54:13 -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/pengine Modified Files: allocate.c Log Message: This is unusual but not fatal =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/allocate.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- allocate.c 21 Jun 2006 14:53:48 -0000 1.9 +++ allocate.c 23 Jun 2006 08:54:13 -0000 1.10 @@ -1,4 +1,4 @@ -/* $Id: allocate.c,v 1.9 2006/06/21 14:53:48 andrew Exp $ */ +/* $Id: allocate.c,v 1.10 2006/06/23 08:54:13 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -537,9 +537,11 @@ resource_t *rsc = pe_find_resource(data_set->resources, rsc_id); CRM_CHECK(rsc_id != NULL, return); - CRM_CHECK(rsc != NULL, return); + if(rsc == NULL) { + crm_warn("Skipping param check for resource with no actions"); + return; - if(rsc->orphan) { + } else if(rsc->orphan) { crm_debug_2("Skipping param check for orphan: %s %s", rsc->id, task); return; ------------------------------ _______________________________________________ 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 31, Issue 89 ********************************************