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: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Apr 2006 07:05:22 -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:
Remove rsc_state which was only used for logging and not 100% accurate anyway
Use the correct deprecation #define
Correctly figure out when to skip param checks if on op_digest is present
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -3 -r1.178 -r1.179
--- lrm.c 3 Apr 2006 15:18:25 -0000 1.178
+++ lrm.c 4 Apr 2006 13:05:22 -0000 1.179
@@ -324,7 +324,6 @@
build_operation_update(
crm_data_t *xml_rsc, lrm_op_t *op, const char *src, int lpc)
{
- int len = 0;
char *tmp = NULL;
char *fail_state = NULL;
const char *state = NULL;
@@ -448,14 +447,6 @@
crm_debug("Resource action %s/%s %s: %d",
op->rsc_id, op->op_type,
op_status2text(op->op_status), op->rc);
- len = strlen(op->op_type);
- len += strlen("_failed_");
- crm_malloc0(fail_state, sizeof(char)*len);
- if(fail_state != NULL) {
- sprintf(fail_state, "%s_failed", op->op_type);
- }
- crm_xml_add(xml_op, XML_LRM_ATTR_RSCSTATE, fail_state);
- crm_free(fail_state);
break;
case LRM_OP_DONE:
if(safe_str_eq(CRMD_ACTION_START, op->op_type)) {
@@ -473,8 +464,6 @@
CRMD_ACTION_GENERIC_OK, op->op_type);
state = CRMD_ACTION_GENERIC_OK;
}
-
- crm_xml_add(xml_op, XML_LRM_ATTR_RSCSTATE, state);
break;
}
@@ -500,7 +489,7 @@
*/
crm_data_t *args_xml = NULL;
char *digest = NULL;
-#if CRM_DEPRECATED_SINCE_2_0_4
+#if CRM_DEPRECATED_SINCE_2_0_5
args_xml = create_xml_node(xml_op, XML_TAG_PARAMS);
#else
args_xml = create_xml_node(NULL, XML_TAG_PARAMS);
@@ -509,7 +498,7 @@
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
+#if CRM_DEPRECATED_SINCE_2_0_5
#else
free_xml(args_xml);
#endif
@@ -1146,8 +1135,8 @@
/* now do the op */
op = construct_op(msg, rsc->id, operation);
- crm_info("Performing op %s on %s (interval=%dms)",
- operation, rid, op->interval);
+ crm_info("Performing op %s on %s (interval=%dms, key=%s)",
+ operation, rid, op->interval, transition);
if((AM_I_DC == FALSE && fsa_state != S_NOT_DC)
|| (AM_I_DC && fsa_state != S_TRANSITION_ENGINE)) {
------------------------------
Message: 2
Date: Tue, 4 Apr 2006 07:05: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/pengine
Modified Files:
unpack.c
Log Message:
Remove rsc_state which was only used for logging and not 100% accurate anyway
Use the correct deprecation #define
Correctly figure out when to skip param checks if on op_digest is present
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/unpack.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -3 -r1.178 -r1.179
--- unpack.c 3 Apr 2006 15:05:03 -0000 1.178
+++ unpack.c 4 Apr 2006 13:05:22 -0000 1.179
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.178 2006/04/03 15:05:03 andrew Exp $ */
+/* $Id: unpack.c,v 1.179 2006/04/04 13:05:22 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -889,7 +889,6 @@
gboolean delete_resource = FALSE;
const char *rsc_id = crm_element_value(rsc_entry, XML_ATTR_ID);
- const char *rsc_state = crm_element_value(rsc_entry,
XML_LRM_ATTR_RSCSTATE);
int max_call_id = -1;
GListPtr op_list = NULL;
@@ -900,9 +899,8 @@
resource_t *rsc = unpack_find_resource(data_set, node, rsc_id);
- crm_debug_3("[%s] Processing %s on %s (%s)",
- crm_element_name(rsc_entry),
- rsc_id, node->details->uname, rsc_state);
+ crm_debug_3("[%s] Processing %s on %s",
+ crm_element_name(rsc_entry), rsc_id, node->details->uname);
if(rsc == NULL) {
rsc = process_orphan_resource(rsc_entry, node, data_set);
@@ -1202,6 +1200,7 @@
/* const char *target_rc = NULL; */
const char *task_status = NULL;
const char *interval_s = NULL;
+ const char *op_digest = NULL;
int interval = 0;
int task_id_i = -1;
@@ -1222,6 +1221,7 @@
task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
task_id = crm_element_value(xml_op, XML_LRM_ATTR_CALLID);
task_status = crm_element_value(xml_op, XML_LRM_ATTR_OPSTATUS);
+ op_digest = crm_element_value(xml_op, XML_LRM_ATTR_OP_DIGEST);
CRM_CHECK(id != NULL, return FALSE);
CRM_CHECK(task != NULL, return FALSE);
@@ -1263,7 +1263,7 @@
} else if(safe_str_eq(task, CRMD_ACTION_STOP)) {
crm_debug_2("Ignoring stop params: %s", id);
- } else if(params == NULL) {
+ } else if(op_digest == NULL && params == NULL) {
/* for older test cases */
crm_err("Skipping param check: %s %s", id, task);
------------------------------
Message: 3
Date: Tue, 4 Apr 2006 07:05:44 -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:
events.c
Log Message:
logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- events.c 31 Mar 2006 11:58:17 -0000 1.9
+++ events.c 4 Apr 2006 13:05:44 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.9 2006/03/31 11:58:17 andrew Exp $ */
+/* $Id: events.c,v 1.10 2006/04/04 13:05:44 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -496,7 +496,8 @@
crm_log_xml_debug_2(event, "match:pending");
} else if(rc != -1) {
- crm_warn("Search terminated: %d", rc);
+ crm_warn("Search for %s terminated: %d",
+ ID(event), rc);
abort_transition(INFINITY, tg_restart,
"Unexpected event", event);
}
------------------------------
Message: 4
Date: Tue, 4 Apr 2006 07:06:10 -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/test
Modified Files:
1node.sh.in helper.sh.in
Log Message:
conform to the dtd
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/1node.sh.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- 1node.sh.in 22 Nov 2005 02:43:21 -0000 1.33
+++ 1node.sh.in 4 Apr 2006 13:06:10 -0000 1.34
@@ -54,7 +54,7 @@
do_cmd echo Create the first constraint and wait for S_IDLE
crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
-do_cmd make_constraint $test_node_1 rsc1 can
+do_cmd make_constraint $test_node_1 rsc1 0
cts_assert "Creation of first constraint failed."
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
120 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
@@ -64,7 +64,7 @@
do_cmd echo Create the second constraint and wait for S_IDLE
crm_log_pos=$(stat -L ${STAT_OPTS} $logfile)
-do_cmd make_constraint $test_node_1 rsc2 can
+do_cmd make_constraint $test_node_1 rsc2 0
cts_assert "Creation of second constraint failed."
do_cmd ${testdir}/testutils.pl -p $crm_log_pos -l ${logfile} --search -a -m
120 \
-s "crmd(.*) State transition (.*) \-> S_IDLE"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/test/helper.sh.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- helper.sh.in 12 Jan 2006 16:35:38 -0000 1.75
+++ helper.sh.in 4 Apr 2006 13:06:10 -0000 1.76
@@ -430,7 +430,7 @@
uuid1=`uuidgen`
uuid2=`uuidgen`
- node_xml="<rsc_location id=\\\"${uuid1}\\\" rsc=\\\"${rsc}\\\"><rule
id=\\\"${uuid2}\\\" result=\\\"${result}\\\"/></rsc_location>"
+ node_xml="<rsc_location id=\\\"${uuid1}\\\" rsc=\\\"${rsc}\\\"><rule
id=\\\"${uuid2}\\\" score=\\\"${result}\\\"/></rsc_location>"
make_constraint_adv $host "$node_xml"
}
------------------------------
_______________________________________________
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 15
********************************************
