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: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: cts by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 9 Apr 2006 06:57:38 -0600 (MDT)
From: [email protected]
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:
group.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/group.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- group.c 7 Apr 2006 14:28:12 -0000 1.58
+++ group.c 9 Apr 2006 12:57:37 -0000 1.59
@@ -1,4 +1,4 @@
-/* $Id: group.c,v 1.58 2006/04/07 14:28:12 andrew Exp $ */
+/* $Id: group.c,v 1.59 2006/04/09 12:57:37 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -461,7 +461,7 @@
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
- crm_debug_3("Processing actions from %s", group_data->self->id);
+ crm_debug_3("Processing actions from %s", rsc->id);
CRM_CHECK(group_data->self != NULL, return);
group_data->self->fns->expand(group_data->self, data_set);
------------------------------
Message: 2
Date: Sun, 9 Apr 2006 07:14:03 -0600 (MDT)
From: [email protected]
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/cib
Modified Files:
io.c
Log Message:
Do DTD validation at startup too
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- io.c 7 Apr 2006 14:30:05 -0000 1.62
+++ io.c 9 Apr 2006 13:14:03 -0000 1.63
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.62 2006/04/07 14:30:05 andrew Exp $ */
+/* $Id: io.c,v 1.63 2006/04/09 13:14:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -254,20 +254,41 @@
}
crm_info("Reading cluster configuration from: %s", filename);
- valid = validate_on_disk_cib(filename, &root);
- crm_log_xml_info(root, "[on-disk]");
+ if(validate_on_disk_cib(filename, &root) == FALSE) {
+ valid = FALSE;
+ crm_err("%s has been manually changed"
+ " - please update the md5 digest in %s.sig",
+ filename, filename);
+ }
+
+ if(root != NULL) {
+ const char *ignore_dtd = crm_element_value(root, "ignore_dtd");
+ gboolean dtd_ok = validate_with_dtd(
+ root, HA_LIBDIR"/heartbeat/crm.dtd");
+
+ if(dtd_ok == FALSE
+#if CRM_DEPRECATED_SINCE_2_0_4
+ && ignore_dtd != NULL
+#endif
+ && crm_is_true(ignore_dtd) == FALSE) {
+ crm_err("On disk CIB does not conform to the DTD");
+ valid = FALSE;
+ }
+ }
+ crm_log_xml_info(root, "[on-disk]");
+
if(root == NULL) {
crm_crit("Parse ERROR reading %s.", filename);
crm_crit("Inhibiting respawn by Heartbeat to avoid loss"
- " of configuration data.");
+ " of existing configuration data.");
cl_flush_logs();
exit(100);
} else if(valid == FALSE) {
- crm_err("%s has been manually changed"
- " - please update the md5 digest in %s.sig",
- filename, filename);
+ crm_err("%s does not contain a valid configuration", filename);
+ crm_crit("Inhibiting respawn by Heartbeat to avoid loss"
+ " of existing configuration data.");
cl_flush_logs();
exit(100);
}
------------------------------
Message: 3
Date: Sun, 9 Apr 2006 07:15:12 -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:
typo
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- CIB.py.in 9 Apr 2006 12:57:14 -0000 1.10
+++ CIB.py.in 9 Apr 2006 13:15:11 -0000 1.11
@@ -97,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 di="master-child">
+ <instance_attributes id="master-child">
<attributes>
<nvpair id="logfile_id_1" name="logfile"
value="/var/log/cts_ocfdummy.log"/>
</attributes>
------------------------------
Message: 4
Date: Sun, 9 Apr 2006 07:15:43 -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_attrs.c
Log Message:
Allow the section to be defaulted too
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_attrs.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- cib_attrs.c 7 Apr 2006 14:08:07 -0000 1.18
+++ cib_attrs.c 9 Apr 2006 13:15:43 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Id: cib_attrs.c,v 1.18 2006/04/07 14:08:07 andrew Exp $ */
+/* $Id: cib_attrs.c,v 1.19 2006/04/09 13:15:43 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -46,9 +46,13 @@
if(attr_id == NULL && attr_name == NULL) { \
return cib_missing; \
\
+ } else if(section == NULL && node_uuid == NULL) { \
+ section = XML_CIB_TAG_CRMCONFIG; \
+ \
} else if(section == NULL) { \
- return cib_NOSECTION; \
+ section = XML_CIB_TAG_STATUS; \
} \
+ \
if(safe_str_eq(section, XML_CIB_TAG_CRMCONFIG)) { \
tag = NULL; \
is_crm_config = TRUE; \
@@ -65,15 +69,15 @@
set_name = node_uuid; \
} \
\
- } else if(node_uuid != NULL) { \
+ } else if(safe_str_eq(section, XML_CIB_TAG_STATUS)) { \
is_node_transient = TRUE; \
tag = XML_TAG_TRANSIENT_NODEATTRS; \
- if(node_uuid == NULL) { \
- return cib_missing; \
- } \
if(set_name == NULL) { \
set_name = node_uuid; \
} \
+ \
+ } else { \
+ return cib_bad_section; \
} \
\
if(attr_id == NULL) { \
------------------------------
_______________________________________________
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 43
********************************************
