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)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Aug 2006 03:06:31 -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/admin
Modified Files:
crm_verify.c
Log Message:
Finish creating generic, self-documenting option processing code
Use the above to impliment the meta-data command for the pengine and crmd
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- crm_verify.c 18 Jul 2006 06:15:54 -0000 1.18
+++ crm_verify.c 14 Aug 2006 09:06:31 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.18 2006/07/18 06:15:54 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.19 2006/08/14 09:06:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -218,12 +218,12 @@
#endif
crm_notice("Required feature set: %s", feature_set(cib_object));
if(do_id_check(cib_object, NULL, FALSE, FALSE)) {
- pe_config_err("ID Check failed");
+ crm_config_err("ID Check failed");
}
if(validate_with_dtd(
cib_object, FALSE, HA_LIBDIR"/heartbeat/crm.dtd") == FALSE) {
- pe_config_err("CIB did not pass DTD validation");
+ crm_config_err("CIB did not pass DTD validation");
}
set_working_set_defaults(&data_set);
data_set.input = cib_object;
@@ -244,14 +244,14 @@
}
#endif
- if(was_config_error) {
+ if(crm_config_error) {
fprintf(stderr, "Errors found during check: config not
valid\n");
if(crm_log_level < LOG_WARNING) {
fprintf(stderr, " -V may provide more details\n");
}
rc = 2;
- } else if(was_config_warning) {
+ } else if(crm_config_warning) {
fprintf(stderr, "Warnings found during check: config may not be
valid\n");
if(crm_log_level < LOG_WARNING) {
fprintf(stderr, " Use -V for more details\n");
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 03:06:32 -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:
Finish creating generic, self-documenting option processing code
Use the above to impliment the meta-data command for the pengine and crmd
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- CIB.py.in 14 Aug 2006 09:00:56 -0000 1.19
+++ CIB.py.in 14 Aug 2006 09:06:31 -0000 1.20
@@ -16,32 +16,32 @@
cib_option_template = '''
<cluster_property_set id="cib-bootstrap-options">
<attributes>
- <nvpair id="cib-bootstrap-options-default_action_timeout"
name="default_action_timeout" value="5s"/>
- <nvpair id="cib-bootstrap-options-network-delay"
name="network-delay" value="30s"/>
- <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-default-action-timeout"
name="default-action-timeout" value="10s"/>
+ <nvpair id="cib-bootstrap-options-network-delay"
name="network-delay" value="60s"/>
+ <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"/>
+ <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 *** _NEVER_ make this the default -->
+ <nvpair id="cib-bootstrap-optionsstartup-fencing"
name="startup-fencing" value="false"/>
</attributes>
</cluster_property_set>'''
dc_ipaddr_resource_template = '''
<primitive id="DcIPaddr" class="ocf" type="IPaddr"
provider="heartbeat" is_managed="1">
<operations>
- <op id="DcIPaddr-1" name="monitor" interval="5s" timeout="45s"/>
- <op id="DcIPaddr-2" name="start" timeout="45s"/>
+ <op id="DcIPaddr-1" name="monitor" interval="5s"/>
+ <op id="DcIPaddr-2" name="start"/>
</operations>
<instance_attributes id="DcIPaddr">
<attributes>
@@ -53,8 +53,8 @@
clustermon_resource_template = '''
<primitive id="cluster_mon" class="ocf" type="ClusterMon"
provider="heartbeat" is_managed="1">
<operations>
- <op id="cluster_mon-1" name="monitor" interval="5s" timeout="45s"
prereq="nothing"/>
- <op id="cluster_mon-2" name="start" timeout="45s"
prereq="nothing"/>
+ <op id="cluster_mon-1" name="monitor" interval="5s"
prereq="nothing"/>
+ <op id="cluster_mon-2" name="start" prereq="nothing"/>
</operations>
<instance_attributes id="ClusterMon">
<attributes>
@@ -83,7 +83,7 @@
lsb_resource = '''
<primitive id="lsb_dummy" class="lsb"
type="@libdir@/heartbeat/cts/LSBDummy" provider="heartbeat">
<operations>
- <op id="ocf_lsb_monitor" name="monitor" interval="5s"
timeout="45s"/>
+ <op id="ocf_lsb_monitor" name="monitor" interval="5s"/>
</operations>
</primitive> '''
@@ -99,8 +99,8 @@
</instance_attributes>
<primitive id="ocf_msdummy" class="ocf"
type="@libdir@/heartbeat/cts/OCFMSDummy" provider="heartbeat">
<operations>
- <op id="ocf_msdummy_monitor" name="monitor" interval="5s"
timeout="60s"/>
- <op id="ocf_msdummy_monitor_master" name="monitor" interval="6s"
timeout="60s" role="Master"/>
+ <op id="ocf_msdummy_monitor" name="monitor" interval="5s"/>
+ <op id="ocf_msdummy_monitor_master" name="monitor" interval="6s"
role="Master"/>
</operations>
<instance_attributes id="master-child">
<attributes>
@@ -114,7 +114,7 @@
<group id="group-1">
<primitive id="ocf_%s" class="ocf" type="IPaddr"
provider="heartbeat">
<operations>
- <op id="ocf_chil%s_monitor" name="monitor" interval="5s"
timeout="45s"/>
+ <op id="ocf_chil%s_monitor" name="monitor" interval="5s"/>
</operations>
<instance_attributes id="ip-1">
<attributes>
@@ -124,7 +124,7 @@
</primitive>
<primitive id="heartbeat_%s" class="heartbeat" type="IPaddr"
provider="heartbeat">
<operations>
- <op id="heartbeat_%s_monitor" name="monitor" interval="5s"
timeout="45s"/>
+ <op id="heartbeat_%s_monitor" name="monitor" interval="5s"/>
</operations>
<instance_attributes id="ip-2">
<attributes>
@@ -134,7 +134,7 @@
</primitive>
<primitive id="ocf_%s" class="ocf" type="IPaddr"
provider="heartbeat">
<operations>
- <op id="ocf_%s_monitor" name="monitor" interval="5s"
timeout="45s"/>
+ <op id="ocf_%s_monitor" name="monitor" interval="5s"/>
</operations>
<instance_attributes id="ip-3">
<attributes>
@@ -148,8 +148,8 @@
per_node_resource_template = '''
<primitive id="%s" class="ocf" type="IPaddr" provider="heartbeat"
is_managed="1">
<operations>
- <op id="%s-1" name="monitor" interval="5s" timeout="45s"/>
- <op id="%s-2" name="start" timeout="45s"/>
+ <op id="%s-1" name="monitor" interval="5s"/>
+ <op id="%s-2" name="start"/>
</operations>
<instance_attributes id="%s">
<attributes>
@@ -175,8 +175,8 @@
</instance_attributes>
<primitive id="child_DoFencing" class="stonith" type="ssh">
<operations>
- <op id="DoFencing-1" name="monitor" interval="20s" timeout="45s"
prereq="nothing"/>
- <op id="DoFencing-2" name="start" timeout="45s"
prereq="nothing"/>
+ <op id="DoFencing-1" name="monitor" interval="20s"
prereq="nothing"/>
+ <op id="DoFencing-2" name="start" prereq="nothing"/>
</operations>
<instance_attributes id="fencing-child">
<attributes>
------------------------------
_______________________________________________
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 18
********************************************
