Send Linux-ha-cvs mailing list submissions to
[email protected]
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
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: lib by andrew from
([email protected])
4. Linux-HA CVS: include by andrew from
([email protected])
5. Linux-HA CVS: cts by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 9 Apr 2006 06:55:45 -0600 (MDT)
From: [email protected]
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:
xml.c
Log Message:
Reorder the parsing to avoid FILE leak
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- xml.c 7 Apr 2006 14:05:30 -0000 1.69
+++ xml.c 9 Apr 2006 12:55:44 -0000 1.70
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.69 2006/04/07 14:05:30 andrew Exp $ */
+/* $Id: xml.c,v 1.70 2006/04/09 12:55:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -612,19 +612,17 @@
crm_xml_add(xml_node, XML_CIB_ATTR_WRITTEN, now_str);
crm_validate_data(xml_node);
+ buffer = dump_xml_formatted(xml_node);
+ CRM_CHECK(buffer != NULL && strlen(buffer) > 0, return -1);
+
file_output_strm = fopen(filename, "w");
if(file_output_strm == NULL) {
+ crm_free(buffer);
cl_perror("Cannot write to %s", filename);
return -1;
}
- buffer = dump_xml_formatted(xml_node);
- CRM_CHECK(buffer != NULL && strlen(buffer) > 0, return -1);
- if(buffer == NULL || strlen(buffer) <= 0) {
- is_done = TRUE;
- }
-
#if HAVE_BZLIB_H
if(compress && is_done == FALSE) {
int rc = BZ_OK;
------------------------------
Message: 2
Date: Sun, 9 Apr 2006 06:56:13 -0600 (MDT)
From: [email protected]
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:
Do the logging from the parent not the child
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- utils.c 7 Apr 2006 14:06:36 -0000 1.42
+++ utils.c 9 Apr 2006 12:56:13 -0000 1.43
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.42 2006/04/07 14:06:36 andrew Exp $ */
+/* $Id: utils.c,v 1.43 2006/04/09 12:56:13 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1236,6 +1236,10 @@
{
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) {
pid=fork();
}
@@ -1249,19 +1253,10 @@
crm_debug("Child %d forked to record assert failure",
pid);
return;
- case 0: /* Child */
+ case 0: /* Child */
+ abort();
break;
}
-
- /* create a new process group to avoid
- * being interupted by heartbeat
- */
- setpgid(0, 0);
- do_crm_log(LOG_ERR, file, function,
- "Triggered %sfatal assert at %s:%d : %s",
- do_fork?"non-":"", file, line, assert_condition);
-
- abort();
}
char *
------------------------------
Message: 3
Date: Sun, 9 Apr 2006 06:56:51 -0600 (MDT)
From: [email protected]
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/cib
Modified Files:
cib_client.c
Log Message:
New error code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_client.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- cib_client.c 4 Apr 2006 13:07:36 -0000 1.54
+++ cib_client.c 9 Apr 2006 12:56:50 -0000 1.55
@@ -800,8 +800,12 @@
case cib_diff_resync:
error_msg = "Application of an update diff failed,
requesting a full refresh";
break;
+ case cib_bad_section:
+ error_msg = "Invalid CIB section specified";
+ break;
case cib_old_data:
error_msg = "Update was older than existing
configuration";
+ break;
case cib_dtd_validation:
error_msg = "Update does conform to the DTD in
"HA_LIBDIR"/heartbeat/crm.dtd";
break;
------------------------------
Message: 4
Date: Sun, 9 Apr 2006 06:56:50 -0600 (MDT)
From: [email protected]
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:
cib.h
Log Message:
New error code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/cib.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- cib.h 6 Apr 2006 10:51:06 -0000 1.40
+++ cib.h 9 Apr 2006 12:56:50 -0000 1.41
@@ -1,4 +1,4 @@
-/* $Id: cib.h,v 1.40 2006/04/06 10:51:06 andrew Exp $ */
+/* $Id: cib.h,v 1.41 2006/04/09 12:56:50 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -114,7 +114,8 @@
cib_diff_resync = -44,
cib_old_data = -45,
cib_id_check = -46,
- cib_dtd_validation = -47
+ cib_dtd_validation = -47,
+ cib_bad_section = -48
};
enum cib_update_op {
------------------------------
Message: 5
Date: Sun, 9 Apr 2006 06:57:14 -0600 (MDT)
From: [email protected]
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:
Conform to the DTD
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- CIB.py.in 9 Apr 2006 12:47:14 -0000 1.9
+++ CIB.py.in 9 Apr 2006 12:57:14 -0000 1.10
@@ -32,14 +32,13 @@
</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="20s"/>
<op id="DcIPaddr-2" name="start" timeout="40s"/>
</operations>
- <instance_attributes>
+ <instance_attributes id="DcIPaddr">
<attributes>
<nvpair id="DcIPaddr-1" name="ip" value="%s"/>
</attributes>
@@ -52,7 +51,7 @@
<op id="cluster_mon-1" name="monitor" interval="5s" timeout="20s"
prereq="nothing"/>
<op id="cluster_mon-2" name="start" timeout="20s"
prereq="nothing"/>
</operations>
- <instance_attributes>
+ <instance_attributes id="ClusterMon">
<attributes>
<nvpair id="cluster_mon-1" name="htmlfile"
value="/suse/abeekhof/Export/cluster.html"/>
<nvpair id="cluster_mon-2" name="update" value="10"/>
@@ -85,7 +84,7 @@
master_slave_resource = '''
<master_slave id="master_rsc_1">
- <instance_attributes>
+ <instance_attributes id="master_rsc">
<attributes>
<nvpair id="clone_max_1" name="clone_max" value="%d"/>
<nvpair id="clone_node_max_2" name="clone_node_max" value="%d"/>
@@ -98,7 +97,7 @@
<op id="ocf_msdummy_monitor" name="monitor" interval="5s"
timeout="10s"/>
<op id="ocf_msdummy_monitor_master" name="monitor" interval="6s"
timeout="10s" role="Master"/>
</operations>
- <instance_attributes>
+ <instance_attributes di="master-child">
<attributes>
<nvpair id="logfile_id_1" name="logfile"
value="/var/log/cts_ocfdummy.log"/>
</attributes>
@@ -112,7 +111,7 @@
<operations>
<op id="ocf_chil%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
</operations>
- <instance_attributes>
+ <instance_attributes id="ip-1">
<attributes>
<nvpair id="ocf_%s_ip_1" name="ip" value="%s"/>
</attributes>
@@ -122,7 +121,7 @@
<operations>
<op id="heartbeat_%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
</operations>
- <instance_attributes>
+ <instance_attributes id="ip-2">
<attributes>
<nvpair id="heartbeat_%s_ip_1" name="1" value="%s"/>
</attributes>
@@ -132,7 +131,7 @@
<operations>
<op id="ocf_%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
</operations>
- <instance_attributes>
+ <instance_attributes id="ip-3">
<attributes>
<nvpair id="ocf_%s_ip_1" name="ip" value="%s"/>
</attributes>
@@ -147,7 +146,7 @@
<op id="%s-1" name="monitor" interval="5s" timeout="20s"/>
<op id="%s-2" name="start" timeout="40s"/>
</operations>
- <instance_attributes>
+ <instance_attributes id="ip-2">
<attributes>
<nvpair id="%s-1" name="ip" value="%s"/>
</attributes>
@@ -163,7 +162,7 @@
stonith_resource_template = """
<clone id="DoFencing">
- <instance_attributes>
+ <instance_attributes id="fencing">
<attributes>
<nvpair id="DoFencing-1" name="clone_max" value="%d"/>
<nvpair id="DoFencing-2" name="clone_node_max" value="1"/>
@@ -174,7 +173,7 @@
<op id="DoFencing-1" name="monitor" interval="20s" timeout="40s"
prereq="nothing"/>
<op id="DoFencing-2" name="start" timeout="20s"
prereq="nothing"/>
</operations>
- <instance_attributes>
+ <instance_attributes id="fencing-child">
<attributes>
<nvpair id="child_DoFencing-1" name="hostlist" value="%s"/>
</attributes>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 42
********************************************
