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: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 16 Feb 2006 08:17:14 -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:
Do not build updates for probes any differently to any other update.
The TE and PE are able to figure out the right thing to do anyway and
doing this just confuses the TE (which thinks an extra event happened)
after a join (when the CRM requeries the LRM).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- lrm.c 14 Feb 2006 11:55:07 -0000 1.164
+++ lrm.c 16 Feb 2006 15:17:13 -0000 1.165
@@ -1395,7 +1395,8 @@
const char *last_op = NULL;
const char *probe_s = NULL;
gboolean is_probe = FALSE;
-
+ int log_rsc_err = LOG_ERR;
+
if(msg_data->fsa_cause != C_LRM_OP_CALLBACK) {
register_fsa_error(C_FSA_INTERNAL, I_FAIL, NULL);
return I_NULL;
@@ -1411,26 +1412,6 @@
probe_s = g_hash_table_lookup(op->params, XML_ATTR_LRM_PROBE);
is_probe = crm_is_true(probe_s);
- if(is_probe) {
- int target_rc = EXECRA_OK;
- const char *target_rc_s = NULL;
-
- target_rc_s = g_hash_table_lookup(
- op->params, XML_ATTR_TE_TARGET_RC);
-
- CRM_DEV_ASSERT(target_rc_s != NULL);
- if(crm_assert_failed) { return I_NULL; }
-
- target_rc = atoi(target_rc_s);
- if(target_rc == op->rc) {
- op->op_status = LRM_OP_DONE;
- crm_info("Confirmed stopped: %s", op->rsc_id);
-
- } else {
- crm_err("Detected active resource: %s", op->rsc_id);
- }
- }
-
switch(op->op_status) {
case LRM_OP_PENDING:
/* this really shouldnt happen */
@@ -1442,18 +1423,22 @@
execra_code2string(op->rc));
break;
case LRM_OP_ERROR:
- crm_err("LRM operation (%d) %s_%d on %s %s: %s",
- op->call_id, op->op_type,
- op->interval,
- crm_str(op->rsc_id),
- op_status2text(op->op_status),
- execra_code2string(op->rc));
+ if(is_probe) {
+ log_rsc_err = LOG_INFO;
+ }
+ crm_log_maybe(log_rsc_err,
+ "LRM operation (%d) %s_%d on %s %s: %s",
+ op->call_id, op->op_type,
+ op->interval,
+ crm_str(op->rsc_id),
+ op_status2text(op->op_status),
+ execra_code2string(op->rc));
crm_debug("Result: %s", op->output);
break;
case LRM_OP_CANCELLED:
crm_warn("LRM operation (%d) %s_%d on %s %s",
op->call_id, op->op_type,
- op->interval,
+ op->interval,
crm_str(op->rsc_id),
op_status2text(op->op_status));
return I_NULL;
------------------------------
Message: 2
Date: Thu, 16 Feb 2006 08:20:32 -0700 (MST)
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:
transition.h
Log Message:
Remove a heap of crud from the TE
Update the graph with crm_action_t objects
Dont mark anyone "ready" if they depend on a failed action
Always update the graph if we found a match for an event
Some logging improvements, complain about a few more things
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/transition.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- transition.h 14 Feb 2006 11:32:12 -0000 1.1
+++ transition.h 16 Feb 2006 15:20:32 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: transition.h,v 1.1 2006/02/14 11:32:12 andrew Exp $ */
+/* $Id: transition.h,v 1.2 2006/02/16 15:20:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -129,7 +129,7 @@
extern void set_graph_functions(crm_graph_functions_t *fns);
extern crm_graph_t *unpack_graph(crm_data_t *xml_graph);
extern int run_graph(crm_graph_t *graph);
-extern gboolean update_graph(crm_graph_t *graph, int action_id);
+extern gboolean update_graph(crm_graph_t *graph, crm_action_t *action);
extern void destroy_graph(crm_graph_t *graph);
extern const char *transition_status(enum transition_status state);
extern void print_graph(unsigned int log_level, crm_graph_t *graph);
------------------------------
Message: 3
Date: Thu, 16 Feb 2006 08:20:33 -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/tengine
Modified Files:
actions.c callbacks.c events.c tengine.c tengine.h ttest.c
Log Message:
Remove a heap of crud from the TE
Update the graph with crm_action_t objects
Dont mark anyone "ready" if they depend on a failed action
Always update the graph if we found a match for an event
Some logging improvements, complain about a few more things
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- actions.c 15 Feb 2006 13:13:23 -0000 1.8
+++ actions.c 16 Feb 2006 15:20:32 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.8 2006/02/15 13:13:23 andrew Exp $ */
+/* $Id: actions.c,v 1.9 2006/02/16 15:20:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -40,7 +40,7 @@
{
crm_debug("Event handler: action %d executed", pseudo->id);
pseudo->confirmed = TRUE;
- update_graph(graph, pseudo->id);
+ update_graph(graph, pseudo);
trigger_graph();
return TRUE;
}
@@ -185,7 +185,7 @@
} else if(crm_is_true(value)) {
crm_info("Skipping wait for %d", action->id);
action->confirmed = TRUE;
- update_graph(graph, action->id);
+ update_graph(graph, action);
trigger_graph();
} else if(ret && action->timeout > 0) {
@@ -356,10 +356,11 @@
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);
- crm_free(counter);
crm_info("Initiating action %d: %s on %s",
action->id, task_uuid, on_node);
+
+ crm_free(counter);
if(rsc_op != NULL) {
crm_log_xml_debug_2(rsc_op, "Performing");
@@ -375,7 +376,7 @@
if(crm_is_true(value)) {
crm_debug("Skipping wait for %d", action->id);
action->confirmed = TRUE;
- update_graph(transition_graph, action->id);
+ update_graph(transition_graph, action);
trigger_graph();
} else if(action->timeout > 0) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- callbacks.c 15 Feb 2006 13:13:58 -0000 1.64
+++ callbacks.c 16 Feb 2006 15:20:32 -0000 1.65
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.64 2006/02/15 13:13:58 andrew Exp $ */
+/* $Id: callbacks.c,v 1.65 2006/02/16 15:20:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -131,6 +131,7 @@
{
crm_data_t *xml_obj = NULL;
+ const char *from = cl_get_string(msg, F_ORIG);
const char *sys_to = cl_get_string(msg, F_CRM_SYS_TO);
const char *sys_from = cl_get_string(msg, F_CRM_SYS_FROM);
const char *ref = cl_get_string(msg, XML_ATTR_REFERENCE);
@@ -170,6 +171,7 @@
}
if(xml_obj != NULL) {
crm_log_message_adv(LOG_DEBUG_2, "Processing NACK
Reply", msg);
+ crm_debug("Processing NACK from %s", from);
extract_event(xml_obj);
} else {
crm_log_message_adv(LOG_ERR, "Invalid NACK Reply", msg);
@@ -285,7 +287,7 @@
"Unsupport Stonith result", NULL);
}
- update_graph(transition_graph, stonith_id);
+ update_graph(transition_graph, stonith_action);
trigger_graph();
return;
}
@@ -372,7 +374,8 @@
}
timer->source_id = 0;
- crm_warn("Timer popped in state=%d", te_fsa_state);
+ crm_warn("Timer popped in abort_level=%d",
+ transition_graph->abort_priority);
if(timer->reason == timeout_abort) {
crm_err("Transition abort timeout reached..."
" marking transition complete.");
@@ -380,7 +383,7 @@
abort_transition(INFINITY, -1, "Global Timeout", NULL);
return TRUE;
- } else if(te_fsa_state != s_in_transition) {
+ } else if(transition_graph->complete) {
crm_debug("Ignoring timeout while not in transition");
return TRUE;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- events.c 14 Feb 2006 11:43:00 -0000 1.1
+++ events.c 16 Feb 2006 15:20:32 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.1 2006/02/14 11:43:00 andrew Exp $ */
+/* $Id: events.c,v 1.2 2006/02/16 15:20:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -31,6 +31,9 @@
#include <lrm/lrm_api.h>
crm_data_t *need_abort(crm_data_t *update);
+void process_graph_event(crm_data_t *event, const char *event_node);
+int match_graph_event(
+ crm_action_t *action, crm_data_t *event, const char *event_node);
crm_data_t *
need_abort(crm_data_t *update)
@@ -136,7 +139,7 @@
shutdown = match_down_event(0, event_node, NULL);
if(shutdown != NULL) {
- update_graph(transition_graph, shutdown->id);
+ update_graph(transition_graph, shutdown);
trigger_graph();
} else {
@@ -175,95 +178,73 @@
const char *this_action = NULL;
const char *this_node = NULL;
const char *this_uname = NULL;
- const char *this_rsc = NULL;
const char *magic = NULL;
const char *this_event;
char *update_te_uuid = NULL;
const char *update_event;
- crm_action_t *match = NULL;
int op_status_i = -3;
int op_rc_i = -3;
int transition_i = -1;
- if(event == NULL) {
- crm_debug_4("Ignoring NULL event");
- return -1;
- }
-
- this_rsc = crm_element_value(action->xml, XML_LRM_ATTR_RSCID);
+ CRM_DEV_ASSERT(event != NULL);
- if(this_rsc == NULL) {
- crm_debug_4("Skipping non-resource event");
- return -1;
- }
-
crm_debug_3("Processing \"%s\" change", crm_element_name(event));
update_event = crm_element_value(event, XML_ATTR_ID);
magic = crm_element_value(event, XML_ATTR_TRANSITION_MAGIC);
- if(magic == NULL) {
-/* crm_debug("Skipping \"non-change\""); */
- crm_log_xml_debug(event, "Skipping \"non-change\"");
- return -3;
- }
+ CRM_DEV_ASSERT(magic != NULL);
this_action = crm_element_value(action->xml, XML_LRM_ATTR_TASK);
- this_node = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
this_uname = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
+ this_event = crm_element_value(action->xml, XML_LRM_ATTR_TASK_KEY);
+ this_node = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
- this_event = crm_element_value(action->xml, XML_LRM_ATTR_TASK_KEY);
CRM_DEV_ASSERT(this_event != NULL);
if(safe_str_neq(this_event, update_event)) {
crm_debug_2("Action %d : Event mismatch %s vs. %s",
action->id, this_event, update_event);
-
+ return -1;
+
} else if(safe_str_neq(this_node, event_node)) {
crm_debug_2("Action %d : Node mismatch %s (%s) vs. %s",
action->id, this_node, this_uname, event_node);
- } else {
- match = action;
- }
-
- if(match == NULL) {
return -1;
+
}
-
+
crm_debug("Matched action (%d) %s", action->id, this_event);
CRM_DEV_ASSERT(decode_transition_magic(
magic, &update_te_uuid,
&transition_i, &op_status_i, &op_rc_i));
- if(event == NULL) {
- crm_err("No event");
-
- } else if(transition_i == -1) {
+ if(transition_i == -1) {
/* we never expect these - recompute */
crm_err("Detected an action initiated outside of a transition");
crm_log_message(LOG_ERR, event);
- return -5;
+ return -2;
} else if(safe_str_neq(update_te_uuid, te_uuid)) {
crm_info("Detected an action from a different transitioner:"
" %s vs. %s", update_te_uuid, te_uuid);
crm_log_message(LOG_INFO, event);
- return -6;
+ return -3;
} else if(transition_graph->id != transition_i) {
crm_warn("Detected an action from a different transition:"
" %d vs. %d", transition_i, transition_graph->id);
crm_log_message(LOG_INFO, event);
- return -3;
+ return -4;
}
/* stop this event's timer if it had one */
- stop_te_timer(match->timer);
- match->confirmed = TRUE;
+ stop_te_timer(action->timer);
+ action->confirmed = TRUE;
- target_rc_s = g_hash_table_lookup(match->params,XML_ATTR_TE_TARGET_RC);
+ target_rc_s = g_hash_table_lookup(action->params,XML_ATTR_TE_TARGET_RC);
if(target_rc_s != NULL) {
target_rc = crm_parse_int(target_rc_s, NULL);
if(target_rc == op_rc_i) {
@@ -284,7 +265,6 @@
}
/* Process OP status */
- allow_fail = g_hash_table_lookup(match->params, XML_ATTR_TE_ALLOWFAIL);
switch(op_status_i) {
case -3:
crm_err("Action returned the same as last time..."
@@ -293,44 +273,50 @@
break;
case LRM_OP_PENDING:
crm_debug("Ignoring pending operation");
- return -4;
+ return -5;
break;
case LRM_OP_DONE:
break;
case LRM_OP_ERROR:
case LRM_OP_TIMEOUT:
case LRM_OP_NOTSUPPORTED:
- match->failed = TRUE;
+ action->failed = TRUE;
crm_warn("Action %s on %s failed (rc: %d vs. %d): %s",
update_event, event_node, target_rc, op_rc_i,
op_status2text(op_status_i));
- if(FALSE == crm_is_true(allow_fail)) {
- abort_transition(
- match->synapse->priority,
- tg_restart, "Event failed", event);
- return -2;
- }
break;
case LRM_OP_CANCELLED:
/* do nothing?? */
crm_err("Dont know what to do for cancelled ops yet");
break;
default:
+ action->failed = TRUE;
crm_err("Unsupported action result: %d", op_status_i);
- abort_transition(INFINITY, tg_restart,
- "Unsupported result", event);
- return -2;
}
-
- te_log_action(LOG_INFO, "Action %s (%d) confirmed",
- this_event, match->id);
- update_graph(transition_graph, match->id);
+
+ update_graph(transition_graph, action);
trigger_graph();
+
+ if(action->failed) {
+ allow_fail = g_hash_table_lookup(
+ action->params, XML_ATTR_TE_ALLOWFAIL);
+ if(crm_is_true(allow_fail)) {
+ action->failed = FALSE;
+ }
+ }
- if(te_fsa_state != s_in_transition) {
- return -3;
+ if(action->failed) {
+ abort_transition(action->synapse->priority,
+ tg_restart, "Event failed", event);
+
+ } else if(transition_graph->complete) {
+ abort_transition(INFINITY, tg_restart,"No active graph", event);
}
- return match->id;
+
+ te_log_action(LOG_INFO, "Action %s (%d) confirmed",
+ this_event, action->id);
+
+ return action->id;
}
crm_action_t *
@@ -405,11 +391,10 @@
}
-gboolean
+void
process_graph_event(crm_data_t *event, const char *event_node)
{
int rc = -1;
- int action_id = -1;
int op_status_i = 0;
const char *magic = NULL;
const char *rsc_id = NULL;
@@ -422,16 +407,17 @@
if(op_status != NULL) {
op_status_i = crm_parse_int(op_status, NULL);
- if(op_status_i == -1) {
+ if(op_status_i == LRM_OP_PENDING) {
/* just information that the action was sent */
crm_debug_2("Ignoring TE initiated updates");
- return TRUE;
+ return;
}
}
if(magic == NULL) {
crm_log_xml_debug_2(event, "Skipping \"non-change\"");
- action_id = -3;
+ return;
+
} else {
crm_debug_2("Processing CIB update: %s on %s: %s",
rsc_id, event_node, magic);
@@ -445,66 +431,28 @@
action, crm_action_t, synapse->actions, lpc2,
rc = match_graph_event(action, event, event_node);
- if(action_id >= 0 && rc >= 0) {
- crm_err("Additional match found: %d [%d]",
- rc, action_id);
+ if(rc >= 0) {
+ crm_log_xml_debug_2(event, "match:found");
+
+ } else if(rc == -5) {
+ crm_log_xml_debug_2(event, "match:pending");
+
} else if(rc != -1) {
- action_id = rc;
+ crm_err("Search terminated: %d", rc);
+ abort_transition(INFINITY, tg_restart,
+ "Unexpected event", event);
}
- );
- if(action_id != -1) {
- crm_debug_2("Terminating search: %d", action_id);
- break;
- }
- );
-#if 0
- if(action_id == -1) {
- /* didnt find a match...
- * now try any dangling inputs
- */
- slist_iter(
- synapse, synapse_t, graph, lpc,
-
- slist_iter(
- action, crm_action_t, synapse->inputs, lpc2,
-
- rc = match_graph_event(action,event,event_node);
- if(action_id >=0 && rc >=0 && rc != action_id) {
- crm_err("Additional match found:"
- " %d [%d]", rc, action_id);
- } else if(rc != -1) {
- action_id = rc;
- }
- );
- if(action_id != -1) {
- break;
+
+ if(rc != -1) {
+ return;
}
);
- }
-#endif
- if(action_id > -1) {
- crm_log_xml_debug_2(event, "Event found");
-
- } else if(action_id == -2) {
- crm_log_xml_debug(event, "Event failed");
-
-#if 0
- } else if(action_id == -3) {
- crm_log_xml_info(event, "Old event found");
-#endif
-
- } else if(action_id == -4) {
- crm_log_xml_debug(event, "Pending event found");
-
- } else {
- /* unexpected event, trigger a pe-recompute */
- /* possibly do this only for certain types of actions */
- crm_debug_2("Search terminated: %d", action_id);
- abort_transition(
- INFINITY, tg_restart, "Unexpected event", event);
- return FALSE;
- }
+ );
- return TRUE;
+ /* unexpected event, trigger a pe-recompute */
+ /* possibly do this only for certain types of actions */
+ crm_err("Event not found.");
+ abort_transition(INFINITY, tg_restart, "Unexpected event", event);
+ return;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/tengine.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- tengine.c 14 Feb 2006 11:40:25 -0000 1.112
+++ tengine.c 16 Feb 2006 15:20:32 -0000 1.113
@@ -1,4 +1,4 @@
-/* $Id: tengine.c,v 1.112 2006/02/14 11:40:25 andrew Exp $ */
+/* $Id: tengine.c,v 1.113 2006/02/16 15:20:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -45,22 +45,6 @@
char *te_uuid = NULL;
extern gboolean shuttingdown;
-const te_fsa_state_t te_state_matrix[i_invalid][s_invalid] =
-{
- /* s_idle, s_in_transition, s_abort_pending,
s_updates_pending */
-/* Got an i_transition */{ s_in_transition, s_abort_pending, s_abort_pending,
s_updates_pending },
-/* Got an i_cancel */{ s_idle, s_abort_pending, s_abort_pending,
s_updates_pending },
-/* Got an i_complete */{ s_idle, s_idle, s_abort_pending,
s_updates_pending },
-/* Got an i_cmd_complete*/{ s_idle, s_in_transition,
s_updates_pending, s_updates_pending },
-/* Got an i_cib_complete*/{ s_idle, s_in_transition, s_abort_pending,
s_idle },
-/* Got an i_cib_confirm */{ s_idle, s_in_transition, s_abort_pending,
s_updates_pending },
-/* Got an i_cib_notify */{ s_idle, s_in_transition, s_abort_pending,
s_updates_pending }
-};
-
-
-
-te_fsa_state_t te_fsa_state = s_idle;
-
int
unconfirmed_actions(void)
{
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/tengine.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- tengine.h 14 Feb 2006 11:40:25 -0000 1.32
+++ tengine.h 16 Feb 2006 15:20:32 -0000 1.33
@@ -1,4 +1,4 @@
-/* $Id: tengine.h,v 1.32 2006/02/14 11:40:25 andrew Exp $ */
+/* $Id: tengine.h,v 1.33 2006/02/16 15:20:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -26,44 +26,7 @@
extern IPC_Channel *crm_ch;
extern GMainLoop* mainloop;
-typedef enum te_reason_e {
- te_update,
- te_done,
- te_halt,
- te_abort,
- te_abort_confirmed,
- te_failed,
- te_abort_timeout,
- te_timeout,
-} te_reason_t;
-
-typedef enum te_fsa_states_e {
- s_idle,
- s_in_transition,
- s_abort_pending,
- s_updates_pending,
- s_invalid
-
-} te_fsa_state_t;
-
-typedef enum te_fsa_inputs_e {
- i_transition,
- i_cancel,
- i_complete,
- i_cmd_complete,
- i_cib_complete,
- i_cib_confirm,
- i_cib_notify,
- i_invalid
-} te_fsa_input_t;
-
-extern const te_fsa_state_t te_state_matrix[i_invalid][s_invalid];
-extern te_fsa_state_t te_fsa_state;
-
/* tengine */
-extern gboolean process_graph_event(crm_data_t *event, const char *event_node);
-extern int match_graph_event(
- crm_action_t *action, crm_data_t *event, const char *event_node);
extern crm_action_t *match_down_event(
int rc, const char *target, const char *filter);
extern void send_stonith_update(stonith_ops_t * op);
@@ -71,8 +34,6 @@
extern gboolean cib_action_update(crm_action_t *action, int status);
/* utils */
-extern void send_complete(const char *text, crm_data_t *msg,
- te_reason_t reason, te_fsa_input_t input);
extern gboolean stop_te_timer(te_timer_t *timer);
extern gboolean start_te_timer(te_timer_t *timer);
extern const char *get_rsc_state(const char *task, op_status_t status);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/ttest.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ttest.c 14 Feb 2006 11:40:25 -0000 1.22
+++ ttest.c 16 Feb 2006 15:20:32 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Id: ttest.c,v 1.22 2006/02/14 11:40:25 andrew Exp $ */
+/* $Id: ttest.c,v 1.23 2006/02/16 15:20:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -52,7 +52,7 @@
{
crm_debug("Event handler: action %d executed", pseudo->id);
pseudo->confirmed = TRUE;
- update_graph(graph, pseudo->id);
+ update_graph(graph, pseudo);
trigger_graph();
return TRUE;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 68
********************************************
