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: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by lars 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: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Jun 2006 05:06:38 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
unpack.c
Log Message:
Remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/unpack.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- unpack.c 19 Jun 2006 09:34:38 -0000 1.6
+++ unpack.c 21 Jun 2006 11:06:38 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.6 2006/06/19 09:34:38 andrew Exp $ */
+/* $Id: unpack.c,v 1.7 2006/06/21 11:06:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -280,8 +280,6 @@
crm_action_debug_3(print_node("Added", new_node, FALSE));
);
-/* data_set->nodes = g_list_sort(data_set->nodes, sort_node_weight); */
-
return TRUE;
}
------------------------------
Message: 2
Date: Wed, 21 Jun 2006 05:40:52 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
The GUI creates meaningless placeholders first, which only in a second
step can be filled with content. Allow this for 2.0.6 so we don't have
to turn DTD validation off completely.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- crm-1.0.dtd 21 Jun 2006 08:37:39 -0000 1.78
+++ crm-1.0.dtd 21 Jun 2006 11:40:52 -0000 1.79
@@ -160,7 +160,7 @@
score (INFINITY|-INFINITY) #REQUIRED>
<!-- Annotated version -->
-<!ELEMENT rsc_location (lifetime?,rule+)>
+<!ELEMENT rsc_location (lifetime?,rule*)>
<!ATTLIST rsc_location
id CDATA #REQUIRED
description CDATA #IMPLIED
@@ -169,7 +169,7 @@
<!ATTLIST lifetime id CDATA #REQUIRED>
<!-- Annotated version -->
-<!ELEMENT rule (expression|date_expression|rule)+>
+<!ELEMENT rule (expression|date_expression|rule)*>
<!ATTLIST rule
id CDATA #REQUIRED
role CDATA #IMPLIED
------------------------------
Message: 3
Date: Wed, 21 Jun 2006 08:44:31 -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/crmd
Modified Files:
lrm.c
Log Message:
Always include the op_digest
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -3 -r1.195 -r1.196
--- lrm.c 2 Jun 2006 15:37:47 -0000 1.195
+++ lrm.c 21 Jun 2006 14:44:31 -0000 1.196
@@ -498,29 +498,25 @@
crm_xml_add_int(xml_op, XML_LRM_ATTR_OPSTATUS, op->op_status);
crm_xml_add_int(xml_op, XML_LRM_ATTR_INTERVAL, op->interval);
- if(safe_str_neq(op->op_type, CRMD_ACTION_STOP)) {
- /* this will enable us to later determin that the
- * resource's parameters have changed and we should force
- * a restart
- * however it will come at the cost of a potentially much
- * larger CIB
- */
- char *digest = NULL;
- crm_data_t *args_xml = NULL;
- crm_data_t *args_parent = NULL;
+ /* this will enable us to later determin that the
+ * resource's parameters have changed and we should force
+ * a restart
+ */
+ char *digest = NULL;
+ crm_data_t *args_xml = NULL;
+ crm_data_t *args_parent = NULL;
#if CRM_DEPRECATED_SINCE_2_0_4
- if(compare_version("1.0.4", caller_version) > 0) {
- args_parent = xml_op;
- }
+ if(compare_version("1.0.4", 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, caller_version);
- digest = calculate_xml_digest(args_xml, TRUE);
- crm_xml_add(xml_op, XML_LRM_ATTR_OP_DIGEST, digest);
- if(args_parent == NULL) {
- free_xml(args_xml);
- }
+ args_xml = create_xml_node(args_parent, XML_TAG_PARAMS);
+ g_hash_table_foreach(op->params, hash2field, args_xml);
+ filter_action_parameters(args_xml, caller_version);
+ digest = calculate_xml_digest(args_xml, TRUE);
+ crm_xml_add(xml_op, XML_LRM_ATTR_OP_DIGEST, digest);
+ if(args_parent == NULL) {
+ free_xml(args_xml);
}
return TRUE;
------------------------------
Message: 4
Date: Wed, 21 Jun 2006 08:48:01 -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
Modified Files:
graph.c regression.sh
Log Message:
OSDL #1334:
When using anonymous clones, send the resource action with the name that
the clone uses locally, not the name we use for it internally.
Not doing this leads to resource X:0 being stopped as X:1 and everyone thinking
that X:0 is still active.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- graph.c 8 Jun 2006 13:39:10 -0000 1.98
+++ graph.c 21 Jun 2006 14:48:01 -0000 1.99
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.98 2006/06/08 13:39:10 andrew Exp $ */
+/* $Id: graph.c,v 1.99 2006/06/21 14:48:01 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -407,9 +407,16 @@
XML_ATTR_TYPE
};
- crm_xml_add(rsc_xml, XML_ATTR_ID, action->rsc->id);
- crm_xml_add(rsc_xml, XML_ATTR_ID_LONG, action->rsc->long_name);
+ if(action->rsc->clone_name != NULL) {
+ crm_debug("Using clone name %s for %s",
action->rsc->clone_name, action->rsc->id);
+ crm_xml_add(rsc_xml, XML_ATTR_ID,
action->rsc->clone_name);
+ crm_xml_add(rsc_xml, XML_ATTR_ID_LONG, action->rsc->id);
+ } else {
+ crm_xml_add(rsc_xml, XML_ATTR_ID, action->rsc->id);
+ crm_xml_add(rsc_xml, XML_ATTR_ID_LONG,
action->rsc->long_name);
+ }
+
for(lpc = 0; lpc < DIMOF(attr_list); lpc++) {
crm_xml_add(rsc_xml, attr_list[lpc],
g_hash_table_lookup(action->rsc->meta,
attr_list[lpc]));
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- regression.sh 21 Jun 2006 08:31:27 -0000 1.88
+++ regression.sh 21 Jun 2006 14:48:01 -0000 1.89
@@ -178,6 +178,7 @@
do_test inc7 "Clone colocation"
do_test inc8 "Clone anti-colocation"
do_test inc9 "Non-unique clone"
+do_test inc10 "Non-unique clone (stop)"
echo ""
------------------------------
_______________________________________________
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 73
********************************************
