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: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: include by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Jun 2006 02:31:28 -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/testcases
Modified Files:
date-1.xml group11.xml quorum-2.exp quorum-2.xml rsc_dep8.xml
Log Message:
Cleaner regression test output
Detect and report memory leaks and invalid transitions in regression results
Bring a couple more testcases up-to-date
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/date-1.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- date-1.xml 20 Jun 2006 20:04:42 -0000 1.4
+++ date-1.xml 21 Jun 2006 08:31:27 -0000 1.5
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE cib SYSTEM "crm-1.0.dtd">
-<cib num_updates="1" epoch="1" admin_epoch="0" fake_now="2005-002">
+<cib num_updates="1" epoch="1" admin_epoch="0">
<configuration>
<crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
<nvpair id="symmetric_cluster" name="symetric_cluster" value="true"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/group11.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- group11.xml 20 Jun 2006 20:04:42 -0000 1.2
+++ group11.xml 21 Jun 2006 08:31:27 -0000 1.3
@@ -10,6 +10,11 @@
</nodes>
<resources>
<group id="1">
+ <instance_attributes id="G_utility_instance_attrs">
+ <attributes>
+ <nvpair id="G_utility_target_role" name="target_role"
value="started"/>
+ </attributes>
+ </instance_attributes>
<primitive id="rsc1" class="heartbeat" type="apache">
<instance_attributes id="G_utility_instance_attrs">
<attributes>
@@ -25,11 +30,6 @@
</instance_attributes>
</primitive>
<primitive id="rsc3" class="heartbeat" type="apache"/>
- <instance_attributes id="G_utility_instance_attrs">
- <attributes>
- <nvpair id="G_utility_target_role" name="target_role"
value="started"/>
- </attributes>
- </instance_attributes>
</group>
</resources>
<constraints/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/quorum-2.exp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- quorum-2.exp 26 May 2006 14:54:00 -0000 1.21
+++ quorum-2.exp 21 Jun 2006 08:31:27 -0000 1.22
@@ -21,7 +21,7 @@
<action_set>
<rsc_op id="10" operation="stop" operation_key="rsc2_stop_0"
on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc2" long-id="rsc2" class="heartbeat" type="apache"/>
- <attributes crm_feature_set="1.0.6"/>
+ <attributes crm_feature_set="1.0.6" CRM_meta_id="stop-2"
CRM_meta_on_fail="block" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</rsc_op>
</action_set>
<inputs/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/quorum-2.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- quorum-2.xml 20 Jun 2006 20:04:43 -0000 1.10
+++ quorum-2.xml 21 Jun 2006 08:31:27 -0000 1.11
@@ -10,7 +10,7 @@
<node id="uuid2" uname="node2" type="member"/>
</nodes>
<resources>
- <primitive id="rsc1" class="heartbeat" type="apache"/>
+ <primitive id="rsc1" class="heartbeat" type="apache">
<operations>
<op id="stop-1" name="stop" on_fail="block"/>
</operations>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep8.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- rsc_dep8.xml 20 Jun 2006 20:04:44 -0000 1.8
+++ rsc_dep8.xml 21 Jun 2006 08:31:27 -0000 1.9
@@ -41,16 +41,8 @@
</primitive>
</resources>
<constraints>
- <rsc_location id="same_1_2" rsc="rsc1">
- <rule id="colocate_1_2" score="INFINITY">
- <expression id="exp1" attribute="rsc2" operation="colocated"/>
- </rule>
- </rsc_location>
- <rsc_location id="same_3_4" rsc="rsc3">
- <rule id="colocate_3_4" score="INFINITY">
- <expression id="exp2" attribute="rsc4" operation="colocated"/>
- </rule>
- </rsc_location>
+ <rsc_colocation id="same_1_2" from="rsc1" to="rsc2" score="INFINITY"/>
+ <rsc_colocation id="same_3_4" from="rsc3" to="rsc4" score="INFINITY"/>
</constraints>
</configuration>
<status>
------------------------------
Message: 2
Date: Wed, 21 Jun 2006 02:37:40 -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
Modified Files:
crm-1.0.dtd
Log Message:
"nothing" is an alias for "restart" (which is better name anyway)
"ignore" was not listed
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- crm-1.0.dtd 19 Jun 2006 16:16:09 -0000 1.77
+++ crm-1.0.dtd 21 Jun 2006 08:37:39 -0000 1.78
@@ -82,7 +82,7 @@
disabled (true|1|false|0) 'false'
role (Master|Slave|Started|Stopped) 'Started'
prereq (nothing|quorum|fencing) #IMPLIED
- on_fail (nothing|block|stop|restart|fence) #IMPLIED>
+ on_fail (ignore|block|stop|restart|fence) #IMPLIED>
<!-- Annotated version -->
<!ELEMENT group (meta_attributes*, instance_attributes*, primitive*)>
------------------------------
Message: 3
Date: Wed, 21 Jun 2006 02:40: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/admin
Modified Files:
crm_verify.c
Log Message:
Allow DTD errors/warnings to be sent to stderr instead of syslog
------------------------------
Message: 4
Date: Wed, 21 Jun 2006 02:40:13 -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/common
Modified Files:
xml.h
Log Message:
Allow DTD errors/warnings to be sent to stderr instead of syslog
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/xml.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- xml.h 21 May 2006 20:24:23 -0000 1.47
+++ xml.h 21 Jun 2006 08:40:13 -0000 1.48
@@ -1,4 +1,4 @@
-/* $Id: xml.h,v 1.47 2006/05/21 20:24:23 andrew Exp $ */
+/* $Id: xml.h,v 1.48 2006/06/21 08:40:13 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -254,7 +254,8 @@
extern char *calculate_xml_digest(crm_data_t *local_cib, gboolean sort);
-extern gboolean validate_with_dtd(crm_data_t *xml_blob, const char *dtd_file);
+extern gboolean validate_with_dtd(
+ crm_data_t *xml_blob, gboolean to_logs, const char *dtd_file);
#if XML_PARANOIA_CHECKS
# define crm_validate_data(obj) xml_validate(obj)
------------------------------
_______________________________________________
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 70
********************************************
