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])
----------------------------------------------------------------------
Message: 1
Date: Sat, 11 Mar 2006 14:18:38 -0700 (MST)
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:
primatives.c
Log Message:
We cant take shortcuts when adding pieces to the CIB anymore
- if we do then the atomic incrementer doesnt work and we end up with
value="value++" instead of value="1" which makes the PE barf.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/primatives.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- primatives.c 2 Feb 2006 08:33:14 -0000 1.31
+++ primatives.c 11 Mar 2006 21:18:38 -0000 1.32
@@ -1,4 +1,4 @@
-/* $Id: primatives.c,v 1.31 2006/02/02 08:33:14 andrew Exp $ */
+/* $Id: primatives.c,v 1.32 2006/03/11 21:18:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -380,7 +380,7 @@
crm_debug_3("Processing: <%s id=%s>",
crm_str(object_name), crm_str(object_id));
- if(new_obj == NULL) {
+ if(new_obj == NULL || object_name == NULL) {
result = cib_NOOBJECT;
} else if(parent == NULL) {
@@ -400,9 +400,8 @@
} else if(equiv_node != NULL) {
result = cib_EXISTS;
- } else if(add_node_copy(parent, new_obj) == NULL) {
- result = cib_NODECOPY;
-
+ } else {
+ result = update_cib_object(parent, new_obj);
}
return result;
@@ -442,15 +441,7 @@
}
if(target == NULL) {
- target = add_node_copy(parent, update);
- crm_debug_2("Added <%s id=%s>",
- crm_str(object_name), crm_str(object_id));
-
- CRM_DEV_ASSERT(target != NULL);
- if(crm_assert_failed) { return cib_NODECOPY; }
-
- return cib_ok;
-
+ target = create_xml_node(parent, object_name);
}
crm_debug_2("Found node <%s id=%s> to update",
------------------------------
Message: 2
Date: Sat, 11 Mar 2006 14:19:28 -0700 (MST)
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:
Enable fail-count tracking - seems to work...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -3 -r1.168 -r1.169
--- lrm.c 11 Mar 2006 19:19:17 -0000 1.168
+++ lrm.c 11 Mar 2006 21:19:28 -0000 1.169
@@ -1543,11 +1543,11 @@
crm_strdup(op->rsc_id), crm_strdup(op->op_type));
do_update_resource(op);
-/*
+
if(set_failcount) {
update_failcount(op);
}
-*/
+
if(g_hash_table_size(shutdown_ops) > 0) {
char *op_id = make_stop_id(op->rsc_id, op->call_id);
if(g_hash_table_remove(shutdown_ops, op_id)) {
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 22
********************************************
