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: include by andrew from
([email protected])
4. Linux-HA CVS: cts by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 5 Apr 2006 07:42:23 -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:
lrm.c
Log Message:
Allow dtd validation to occur in a 2.0.5-only cluster even if we have
compiled in the compatability code.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -3 -r1.180 -r1.181
--- lrm.c 5 Apr 2006 09:59:35 -0000 1.180
+++ lrm.c 5 Apr 2006 13:42:23 -0000 1.181
@@ -344,6 +344,7 @@
return TRUE;
}
+ caller_version = g_hash_table_lookup(op->params, XML_ATTR_CRM_VERSION);
crm_debug_3("Caller version: %s", caller_version);
if(safe_str_eq(op->op_type, CRMD_ACTION_NOTIFY)) {
@@ -417,7 +418,6 @@
}
#if CRM_DEPRECATED_SINCE_2_0_3
- caller_version = g_hash_table_lookup(op->params, XML_ATTR_CRM_VERSION);
if(compare_version("1.0.3", caller_version) > 0) {
CRM_CHECK(FALSE, ; );
fail_state = generate_transition_magic_v202(
@@ -487,20 +487,22 @@
* however it will come at the cost of a potentially much
* larger CIB
*/
- crm_data_t *args_xml = NULL;
char *digest = NULL;
+ crm_data_t *args_xml = NULL;
+ crm_data_t *args_parent = NULL;
#if CRM_DEPRECATED_SINCE_2_0_4
- args_xml = create_xml_node(xml_op, XML_TAG_PARAMS);
-#else
- args_xml = create_xml_node(NULL, XML_TAG_PARAMS);
+ if(compare_version("1.0.5", caller_version) > 0) {
+ args_parent = xml_op;
+ }
#endif
+ args_xml = create_xml_node(args_parent, XML_TAG_PARAMS);
g_hash_table_foreach(op->params, hash2field, args_xml);
filter_action_parameters(args_xml);
digest = calculate_xml_digest(args_xml, TRUE);
crm_xml_add(xml_op, XML_LRM_ATTR_OP_DIGEST, digest);
-#if !CRM_DEPRECATED_SINCE_2_0_4
- free_xml(args_xml);
-#endif
+ if(args_parent == NULL) {
+ free_xml(args_xml);
+ }
}
return TRUE;
------------------------------
Message: 2
Date: Wed, 5 Apr 2006 07:42:24 -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:
Allow dtd validation to occur in a 2.0.5-only cluster even if we have
compiled in the compatability code.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- io.c 5 Apr 2006 09:59:35 -0000 1.59
+++ io.c 5 Apr 2006 13:42:23 -0000 1.60
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.59 2006/04/05 09:59:35 andrew Exp $ */
+/* $Id: io.c,v 1.60 2006/04/05 13:42:23 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -478,9 +478,7 @@
{
int error_code = cib_ok;
crm_data_t *saved_cib = get_the_CIB();
-#if !CRM_DEPRECATED_SINCE_2_0_4
const char *ignore_dtd = NULL;
-#endif
crm_log_xml_debug_4(new_cib, "Attempting to activate CIB");
@@ -489,15 +487,18 @@
crm_validate_data(saved_cib);
}
-#if !CRM_DEPRECATED_SINCE_2_0_4
ignore_dtd = crm_element_value(new_cib, "ignore_dtd");
- if(crm_is_true(ignore_dtd) == FALSE
- && validate_with_dtd(new_cib, HA_LIBDIR"/heartbeat/crm.dtd") ==
FALSE) {
+ if(
+#if !CRM_DEPRECATED_SINCE_2_0_4
+ ignore_dtd != NULL &&
+#endif
+ crm_is_true(ignore_dtd) == FALSE
+ && validate_with_dtd(
+ new_cib, HA_LIBDIR"/heartbeat/crm.dtd") == FALSE) {
error_code = cib_dtd_validation;
crm_err("Ignoring invalid CIB");
- } else
-#endif
- if (initializeCib(new_cib) == FALSE) {
+
+ } else if (initializeCib(new_cib) == FALSE) {
error_code = cib_ACTIVATION;
crm_err("Ignoring invalid or NULL CIB");
if(saved_cib != NULL) {
------------------------------
Message: 3
Date: Wed, 5 Apr 2006 07:43:34 -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:
crm.h
Log Message:
Up the CRM version number
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- crm.h 3 Apr 2006 16:38:52 -0000 1.91
+++ crm.h 5 Apr 2006 13:43:34 -0000 1.92
@@ -1,4 +1,4 @@
-/* $Id: crm.h,v 1.91 2006/04/03 16:38:52 andrew Exp $ */
+/* $Id: crm.h,v 1.92 2006/04/05 13:43:34 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -82,7 +82,7 @@
#define CIB_FILENAME WORKING_DIR"/cib.xml"
#define CIB_BACKUP WORKING_DIR"/cib_backup.xml"
-#define CRM_FEATURE_SET "1.0.4"
+#define CRM_FEATURE_SET "1.0.5"
#define MSG_LOG 1
#define DOT_FSA_ACTIONS 1
------------------------------
Message: 4
Date: Wed, 5 Apr 2006 07:52:42 -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:
CTSaudits.py.in
Log Message:
got the types wrong
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSaudits.py.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- CTSaudits.py.in 31 Mar 2006 12:02:09 -0000 1.43
+++ CTSaudits.py.in 5 Apr 2006 13:52:42 -0000 1.44
@@ -284,10 +284,11 @@
for inc_name in NumofInc.keys():
if NumofInc[inc_name] != min(up_count, MaxofInc[inc_name]):
passed = 0
- self.CM.log("Cloned resource "+ inc_name
- +" has "+ NumofInc[inc_name]
- +" active instances (max: "+ MaxofInc[inc_name]
- +", active nodes: "+ up_count + ")")
+ self.CM.log("Cloned resource "+ str(inc_name)
+ +" has "+ str(NumofInc[inc_name])
+ +" active instances (max: "
+ + str(MaxofInc[inc_name])
+ +", active nodes: "+ str(up_count) + ")")
Groups = self.CM.ResourceGroups()
for group in Groups :
------------------------------
_______________________________________________
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 27
********************************************
