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: lib by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 9 Apr 2006 08:50:04 -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/crmd
Modified Files:
utils.c
Log Message:
The updated (and optionally stricter) update_dc function.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/utils.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- utils.c 5 Apr 2006 13:41:28 -0000 1.89
+++ utils.c 9 Apr 2006 14:50:04 -0000 1.90
@@ -1347,7 +1347,7 @@
}
}
-void update_dc(HA_Message *msg)
+void update_dc(HA_Message *msg, gboolean assert_same)
{
const char *dc_version = NULL;
const char *welcome_from = NULL;
@@ -1356,8 +1356,17 @@
dc_version = cl_get_string(msg, F_CRM_VERSION);
welcome_from = cl_get_string(msg, F_CRM_HOST_FROM);
- CRM_ASSERT(welcome_from != NULL);
- CRM_DEV_ASSERT(dc_version != NULL);
+ CRM_CHECK(dc_version != NULL, return);
+ CRM_CHECK(welcome_from != NULL, return);
+ if(AM_I_DC) {
+ CRM_CHECK(safe_str_eq(welcome_from, fsa_our_uname),
+ return);
+ }
+ if(assert_same) {
+ CRM_CHECK(fsa_our_dc != NULL, ;);
+ CRM_CHECK(safe_str_eq(fsa_our_dc, welcome_from), ;);
+ }
+
}
crm_free(fsa_our_dc);
------------------------------
Message: 2
Date: Sun, 9 Apr 2006 08:50:26 -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/tengine
Modified Files:
actions.c
Log Message:
<lrm/> tags need an ID now too
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- actions.c 4 Apr 2006 13:19:20 -0000 1.20
+++ actions.c 9 Apr 2006 14:50:25 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.20 2006/04/04 13:19:20 andrew Exp $ */
+/* $Id: actions.c,v 1.21 2006/04/09 14:50:25 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -290,6 +290,8 @@
crm_xml_add(state, XML_ATTR_UNAME, target);
rsc = create_xml_node(state, XML_CIB_TAG_LRM);
+ crm_xml_add(rsc, XML_ATTR_ID, target_uuid);
+
rsc = create_xml_node(rsc, XML_LRM_TAG_RESOURCES);
rsc = create_xml_node(rsc, XML_LRM_TAG_RESOURCE);
crm_xml_add(rsc, XML_ATTR_ID, rsc_id);
------------------------------
Message: 3
Date: Sun, 9 Apr 2006 08:51:02 -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:
Only log if we changed something
<attributes/> tags don't need ID fields
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- xml.c 9 Apr 2006 14:38:31 -0000 1.71
+++ xml.c 9 Apr 2006 14:51:02 -0000 1.72
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.71 2006/04/09 14:38:31 andrew Exp $ */
+/* $Id: xml.c,v 1.72 2006/04/09 14:51:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2229,6 +2229,7 @@
XML_CIB_TAG_CONSTRAINTS,
XML_CIB_TAG_STATUS,
XML_LRM_TAG_RESOURCES,
+ "attributes",
"operations",
};
@@ -2299,9 +2300,11 @@
xml_obj, local_prop_name, local_prop_value,
if(tag_needs_id(tag_name) == FALSE) {
+ crm_debug_5("%s does not need an ID", tag_name);
break;
} else if(tag_id != NULL && non_unique_allowed(tag_name)){
+ crm_debug_5("%s does not need top be unique", tag_name);
break;
} else if(safe_str_eq(local_prop_name, XML_DIFF_MARKER)) {
@@ -2329,14 +2332,16 @@
break;
);
- if(safe_str_neq(tag_id, old_id)) {
+ if(modified == FALSE) {
+ /* nothing to report */
+
+ } else if(safe_str_neq(tag_id, old_id)) {
crm_err("\"id\" collision detected... Multiple '%s' entries"
" with id=\"%s\", assigned id=\"%s\"",
tag_name, old_id, tag_id);
} else if(old_id == NULL &&& tag_id != NULL) {
- crm_err("Detected <%s.../> with attributes but no ID field",
- tag_name);
+ crm_err("Detected <%s.../> object without an ID", tag_name);
}
crm_free(old_id);
------------------------------
Message: 4
Date: Sun, 9 Apr 2006 08:53:45 -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
Modified Files:
crm-1.0.dtd
Log Message:
Add the ignore_dtd field to the DTD
lrm tags now must include an ID
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- crm-1.0.dtd 6 Apr 2006 10:48:18 -0000 1.54
+++ crm-1.0.dtd 9 Apr 2006 14:53:45 -0000 1.55
@@ -20,14 +20,15 @@
<!ATTLIST cib
cib-last-written CDATA #IMPLIED
- admin_epoch CDATA #IMPLIED
- epoch CDATA #IMPLIED
- num_updates CDATA #IMPLIED
+ admin_epoch CDATA #REQUIRED
+ epoch CDATA #REQUIRED
+ num_updates CDATA #REQUIRED
num_peers CDATA #IMPLIED
dc_uuid CDATA #IMPLIED
ccm_transition CDATA #IMPLIED
have_quorum (true|1|false|0) 'false'
+ ignore_dtd (true|1|false|0) #IMPLIED
cib_feature_revision CDATA #IMPLIED
crm_feature_set CDATA #IMPLIED
@@ -228,6 +229,8 @@
shutdown CDATA #IMPLIED
clear_shutdown CDATA #IMPLIED>
<!ELEMENT lrm (lrm_resources)>
+<!ATTLIST lrm id CDATA #REQUIRED>
+
<!-- Annotated version -->
<!ELEMENT lrm_resources (lrm_resource*)>
------------------------------
_______________________________________________
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 46
********************************************
