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: lib 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: cts by andrew from (linux-ha-cvs@lists.linux-ha.org) 4. Linux-HA CVS: tools by andrew from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Mon, 8 May 2006 03:59:42 -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/transition Modified Files: utils.c Log Message: We're rarely interested in this information now =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/utils.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- utils.c 26 Apr 2006 15:55:42 -0000 1.9 +++ utils.c 8 May 2006 09:59:42 -0000 1.10 @@ -1,4 +1,4 @@ -/* $Id: utils.c,v 1.9 2006/04/26 15:55:42 andrew Exp $ */ +/* $Id: utils.c,v 1.10 2006/05/08 09:59:42 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -174,7 +174,7 @@ } if(action->confirmed == FALSE) { - crm_log_xml(log_level+2, "\t\t\tRaw xml: ", action->xml); + crm_log_xml(LOG_DEBUG_3, "\t\t\tRaw xml: ", action->xml); } } ------------------------------ Message: 2 Date: Mon, 8 May 2006 04:32:42 -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: Check for NULL *after* we retrieve the value =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- actions.c 5 May 2006 13:15:15 -0000 1.27 +++ actions.c 8 May 2006 10:32:42 -0000 1.28 @@ -1,4 +1,4 @@ -/* $Id: actions.c,v 1.27 2006/05/05 13:15:15 andrew Exp $ */ +/* $Id: actions.c,v 1.28 2006/05/08 10:32:42 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -265,8 +265,6 @@ int call_options = cib_quorum_override|cib_scope_local; - CRM_CHECK(rsc_id != NULL, return FALSE); - crm_warn("%s %d: %s on %s timed out", crm_element_name(action->xml), action->id, task_uuid, target); @@ -274,6 +272,8 @@ CRM_CHECK(action_rsc != NULL, return FALSE); rsc_id = ID(action_rsc); + CRM_CHECK(rsc_id != NULL, return FALSE); + code = crm_itoa(status); /* ------------------------------ Message: 3 Date: Mon, 8 May 2006 05:00:20 -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: Simplify the retreival of cluster options (ie. cib_attribute -n is_managed_default -G) =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- CIB.py.in 19 Apr 2006 10:28:22 -0000 1.13 +++ CIB.py.in 8 May 2006 11:00:20 -0000 1.14 @@ -14,21 +14,20 @@ class CIB: cib_option_template = ''' - <cluster_property_set id="default-options"> + <cluster_property_set id="cib-bootstrap-options"> <attributes> - <nvpair id="c-pref-1" name="transition_idle_timeout" value="3m"/> - <nvpair id="c-pref-2" name="symmetric_cluster" value="true"/> - <nvpair id="c-pref-3" name="short_resource_names" value="true"/> - <nvpair id="c-pref-4" name="stop_orphan_resources" value="true"/> - <nvpair id="c-pref-5" name="stop_orphan_actions" value="true"/> - <nvpair id="c-pref-6" name="remove_after_stop" value="false"/> - <nvpair id="c-pref-7" name="is_managed_default" value="true"/> - <nvpair id="c-pref-8" name="no_quorum_policy" value="stop"/> - <nvpair id="c-pref-9" name="default_resource_stickiness" value="0"/> - <nvpair id="c-pref-10" name="stonith_enabled" value="%d"/> - <nvpair id="c-pref-11" name="pe-error-series-max" value="-1"/> - <nvpair id="c-pref-12" name="pe-warn-series-max" value="-1"/> - <nvpair id="c-pref-13" name="pe-input-series-max" value="-1"/> + <nvpair id="cib-bootstrap-options-transition_idle_timeout" name="transition_idle_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_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"/> </attributes> </cluster_property_set>''' @@ -216,7 +215,7 @@ cib_options = cib_options + ''' <cluster_property_set id="bsc-options"> <attributes> - <nvpair id="ident-string" name="ident-string" value="Linux-HA TEST configuration file - REMOVEME!!"/> + <nvpair id="bsc-options-ident-string" name="ident-string" value="Linux-HA TEST configuration file - REMOVEME!!"/> </attributes> </cluster_property_set>''' ------------------------------ Message: 4 Date: Mon, 8 May 2006 05:00:20 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : tools Dir : linux-ha/tools Modified Files: haresources2cib.py.in Log Message: Simplify the retreival of cluster options (ie. cib_attribute -n is_managed_default -G) =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/tools/haresources2cib.py.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- haresources2cib.py.in 20 Apr 2006 10:58:54 -0000 1.12 +++ haresources2cib.py.in 8 May 2006 11:00:20 -0000 1.13 @@ -57,10 +57,9 @@ "no_quorum_policy=stop", "default_resource_stickiness=0", "stonith_enabled=false", - "stop_orphan_resources=false", + "stop_orphan_resources=true", "stop_orphan_actions=true", "remove_after_stop=false", - "short_resource_names=true", "transition_idle_timeout=5min", "is_managed_default=true", ] @@ -77,7 +76,7 @@ configuration.appendChild(crm_config) option_set = doc.createElement("cluster_property_set") - option_set.setAttribute("id","default") + option_set.setAttribute("id","cib-bootstrap-options") crm_config.appendChild(option_set) attr_list = doc.createElement("attributes") @@ -87,7 +86,7 @@ option_details = string.split(option, '=') nvpair = doc.createElement("nvpair") attr_list.appendChild(nvpair) - nvpair.setAttribute("id", option_details[0]) + nvpair.setAttribute("id", "cib-bootstrap-options-"+option_details[0]) nvpair.setAttribute("name", option_details[0]) nvpair.setAttribute("value", option_details[1]) if option_details[0] == "stonith_enabled" and enable_stonith: ------------------------------ _______________________________________________ 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 30, Issue 18 ********************************************