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: cts 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: include 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: Mon, 14 Aug 2006 02:56:40 -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: Disable fencing of unseen nodes in CTS runs because CTS still cant handle it and it seems some people are turning of fencing completely as a result. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- CIB.py.in 11 Jul 2006 01:36:37 -0000 1.17 +++ CIB.py.in 14 Aug 2006 08:56:40 -0000 1.18 @@ -16,20 +16,23 @@ cib_option_template = ''' <cluster_property_set id="cib-bootstrap-options"> <attributes> - <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-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_action_timeout" name="default_action_timeout" value="5s"/> + <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-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"/> + <nvpair id="cib-bootstrap-options-shutdown_escalation" name="shutdown_escalation" value="5min"/> + <!-- *** For CTS testing only *** Do NOT ever make this the default --> + <nvpair id="cib-bootstrap-optionsstartup_fencing" name="startup_fencing" value="false"/> </attributes> </cluster_property_set>''' ------------------------------ Message: 2 Date: Mon, 14 Aug 2006 03:00: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/pengine Modified Files: allocate.c Log Message: Separate action timeouts from network delays by introducing the network-delay option Add the beginnings of a better option processing infrastructure =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/allocate.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- allocate.c 23 Jun 2006 08:54:13 -0000 1.10 +++ allocate.c 14 Aug 2006 09:00:54 -0000 1.11 @@ -1,4 +1,4 @@ -/* $Id: allocate.c,v 1.10 2006/06/23 08:54:13 andrew Exp $ */ +/* $Id: allocate.c,v 1.11 2006/08/14 09:00:54 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -806,14 +806,17 @@ gboolean stage8(pe_working_set_t *data_set) { + const char *value = NULL; char *transition_id_s = NULL; transition_id++; transition_id_s = crm_itoa(transition_id); crm_debug("Creating transition graph %d.", transition_id); + value = cluster_option( + data_set->config_hash, NULL, "network-delay", NULL, "60s"); data_set->graph = create_xml_node(NULL, XML_TAG_GRAPH); - crm_xml_add(data_set->graph, "global_timeout", data_set->transition_idle_timeout); + crm_xml_add(data_set->graph, "network-delay", value); crm_xml_add(data_set->graph, "transition_id", transition_id_s); crm_free(transition_id_s); ------------------------------ Message: 3 Date: Mon, 14 Aug 2006 03:00:57 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : include Dir : linux-ha/include/crm Modified Files: transition.h Log Message: Separate action timeouts from network delays by introducing the network-delay option Add the beginnings of a better option processing infrastructure =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/include/crm/transition.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- transition.h 23 Apr 2006 19:50:19 -0000 1.6 +++ transition.h 14 Aug 2006 09:00:56 -0000 1.7 @@ -1,4 +1,4 @@ -/* $Id: transition.h,v 1.6 2006/04/23 19:50:19 andrew Exp $ */ +/* $Id: transition.h,v 1.7 2006/08/14 09:00:56 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -102,6 +102,7 @@ int num_actions; int num_synapses; + int network_delay; int transition_timeout; GListPtr synapses; /* synpase_t* */ ------------------------------ Message: 4 Date: Mon, 14 Aug 2006 03:00:57 -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: actions.c Log Message: Separate action timeouts from network delays by introducing the network-delay option Add the beginnings of a better option processing infrastructure =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- actions.c 6 Jul 2006 09:30:28 -0000 1.35 +++ actions.c 14 Aug 2006 09:00:56 -0000 1.36 @@ -1,4 +1,4 @@ -/* $Id: actions.c,v 1.35 2006/07/06 09:30:28 andrew Exp $ */ +/* $Id: actions.c,v 1.36 2006/08/14 09:00:56 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -420,7 +420,7 @@ trigger_graph(); } else if(action->timeout > 0) { - int action_timeout = 2 * action->timeout; + int action_timeout = 2 * action->timeout + transition_graph->network_delay; crm_debug_3("Setting timer for action %s", task_uuid); if(transition_graph->transition_timeout < action_timeout) { crm_debug("Action %d:" ------------------------------ _______________________________________________ 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 33, Issue 15 ********************************************