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: include 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: Fri, 5 May 2006 07:15:16 -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 events.c
Log Message:
Get the resource's id from the <primitive/> tag
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- actions.c 26 Apr 2006 13:35:19 -0000 1.26
+++ actions.c 5 May 2006 13:15:15 -0000 1.27
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.26 2006/04/26 13:35:19 andrew Exp $ */
+/* $Id: actions.c,v 1.27 2006/05/05 13:15:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -254,8 +254,8 @@
const char *name = NULL;
const char *value = NULL;
+ const char *rsc_id = NULL;
const char *task = crm_element_value(action->xml, XML_LRM_ATTR_TASK);
- const char *rsc_id = crm_element_value(action->xml, XML_LRM_ATTR_RSCID);
const char *target = crm_element_value(action->xml,
XML_LRM_ATTR_TARGET);
const char *task_uuid = crm_element_value(
action->xml, XML_LRM_ATTR_TASK_KEY);
@@ -273,6 +273,7 @@
action_rsc = find_xml_node(action->xml, XML_CIB_TAG_RESOURCE, TRUE);
CRM_CHECK(action_rsc != NULL, return FALSE);
+ rsc_id = ID(action_rsc);
code = crm_itoa(status);
/*
@@ -333,7 +334,7 @@
params = find_xml_node(action->xml, "attributes", TRUE);
params = copy_xml(params);
- filter_action_parameters(params);
+ filter_action_parameters(params, NULL);
digest = calculate_xml_digest(params, TRUE);
crm_xml_add(xml_op, XML_LRM_ATTR_OP_DIGEST, digest);
crm_free(digest);
@@ -370,7 +371,6 @@
const char *task = NULL;
const char *value = NULL;
- const char *rsc_id = NULL;
const char *on_node = NULL;
const char *task_uuid = NULL;
@@ -380,7 +380,6 @@
rsc_op = action->xml;
task = crm_element_value(rsc_op, XML_LRM_ATTR_TASK);
task_uuid = crm_element_value(action->xml, XML_LRM_ATTR_TASK_KEY);
- rsc_id = crm_element_value(rsc_op, XML_LRM_ATTR_RSCID);
on_node = crm_element_value(rsc_op, XML_LRM_ATTR_TARGET);
counter = generate_transition_key(transition_graph->id, te_uuid);
crm_xml_add(rsc_op, XML_ATTR_TRANSITION_KEY, counter);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- events.c 27 Apr 2006 11:27:48 -0000 1.15
+++ events.c 5 May 2006 13:15:15 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.15 2006/04/27 11:27:48 andrew Exp $ */
+/* $Id: events.c,v 1.16 2006/05/05 13:15:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -164,6 +164,7 @@
static void
update_failcount(crm_action_t *action, int rc)
{
+ crm_data_t *rsc = NULL;
char *attr_name = NULL;
const char *task = NULL;
@@ -183,14 +184,17 @@
}
CRM_CHECK(action->xml != NULL, return);
+
+ rsc = find_xml_node(action->xml, XML_CIB_TAG_RESOURCE, TRUE);
+ CRM_CHECK(rsc != NULL, return);
+ rsc_id = ID(rsc);
+ CRM_CHECK(rsc_id != NULL, return);
task = crm_element_value(action->xml, XML_LRM_ATTR_TASK);
- rsc_id = crm_element_value(action->xml, XML_LRM_ATTR_RSCID);
on_node = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
on_uuid = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
CRM_CHECK(task != NULL, return);
- CRM_CHECK(rsc_id != NULL, return);
CRM_CHECK(on_uuid != NULL, return);
CRM_CHECK(on_node != NULL, return);
------------------------------
Message: 2
Date: Fri, 5 May 2006 07:16:03 -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/common
Modified Files:
util.h
Log Message:
Support an optional version parameter
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/util.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- util.h 18 Apr 2006 11:23:45 -0000 1.34
+++ util.h 5 May 2006 13:16:02 -0000 1.35
@@ -1,4 +1,4 @@
-/* $Id: util.h,v 1.34 2006/04/18 11:23:45 andrew Exp $ */
+/* $Id: util.h,v 1.35 2006/05/05 13:16:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -114,7 +114,7 @@
extern gboolean decode_op_key(
const char *key, char **rsc_id, char **op_type, int *interval);
-extern void filter_action_parameters(crm_data_t *param_set);
+extern void filter_action_parameters(crm_data_t *param_set, const char
*version);
extern gboolean safe_str_eq(const char *a, const char *b);
extern gboolean safe_str_neq(const char *a, const char *b);
------------------------------
Message: 3
Date: Fri, 5 May 2006 07:16:03 -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:
utils.c
Log Message:
Support an optional version parameter
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- utils.c 18 Apr 2006 11:23:45 -0000 1.47
+++ utils.c 5 May 2006 13:16:02 -0000 1.48
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.47 2006/04/18 11:23:45 andrew Exp $ */
+/* $Id: utils.c,v 1.48 2006/05/05 13:16:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1070,7 +1070,7 @@
}
void
-filter_action_parameters(crm_data_t *param_set)
+filter_action_parameters(crm_data_t *param_set, const char *version)
{
const char *attr_filter[] = {
XML_ATTR_ID,
------------------------------
Message: 4
Date: Fri, 5 May 2006 07:36:50 -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:
pengine.c
Log Message:
Bug #1236: Default to stopping deleted resources
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- pengine.c 5 May 2006 13:08:49 -0000 1.110
+++ pengine.c 5 May 2006 13:36:49 -0000 1.111
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.110 2006/05/05 13:08:49 andrew Exp $ */
+/* $Id: pengine.c,v 1.111 2006/05/05 13:36:49 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -365,7 +365,7 @@
data_set->remove_after_stop = FALSE;
data_set->stop_action_orphans = TRUE;
- data_set->stop_rsc_orphans = FALSE;
+ data_set->stop_rsc_orphans = TRUE;
data_set->config_hash = NULL;
data_set->nodes = 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 30, Issue 11
********************************************
