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: Sun, 23 Apr 2006 12:13:28 -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:
callbacks.c lrm.c
Log Message:
Process LRM events *immediately*
- the TE needs them to complete transitions
- we need to wait for the TE before continuing various proceedures
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- callbacks.c 20 Apr 2006 15:43:23 -0000 1.118
+++ callbacks.c 23 Apr 2006 18:13:28 -0000 1.119
@@ -285,19 +285,13 @@
return TRUE;
}
+extern gboolean process_lrm_event(lrm_op_t *op);
+
void
lrm_op_callback(lrm_op_t* op)
{
- CRM_DEV_ASSERT(op != NULL);
- if(crm_assert_failed) {
- return;
- }
-
- crm_debug_3("Invoked: %s/%s (%s)",
- op->op_type, op->rsc_id, op_status2text(op->op_status));
-
- /* Make sure the LRM events are received in order */
- register_fsa_input_later(C_LRM_OP_CALLBACK, I_LRM_EVENT, op);
+ CRM_CHECK(op != NULL, return);
+ process_lrm_event(op);
}
void
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -3 -r1.189 -r1.190
--- lrm.c 22 Apr 2006 10:27:13 -0000 1.189
+++ lrm.c 23 Apr 2006 18:13:28 -0000 1.190
@@ -57,6 +57,7 @@
gboolean is_rsc_active(const char *rsc_id);
void do_update_resource(lrm_op_t *op);
+gboolean process_lrm_event(lrm_op_t *op);
enum crmd_fsa_input do_lrm_rsc_op(
lrm_rsc_t *rsc, char *rid, const char *operation,
@@ -1445,15 +1446,24 @@
enum crmd_fsa_input cur_input,
fsa_data_t *msg_data)
{
- lrm_op_t* op = NULL;
- const char *last_op = NULL;
- const char *probe_s = NULL;
- gboolean is_probe = FALSE;
- int log_rsc_err = LOG_WARNING;
+ lrm_op_t *op = NULL;
CRM_CHECK(msg_data->fsa_cause == C_LRM_OP_CALLBACK, return I_NULL);
op = fsa_typed_data(fsa_dt_lrm);
+ process_lrm_event(op);
+
+ return I_NULL;
+}
+
+
+gboolean
+process_lrm_event(lrm_op_t *op)
+{
+ const char *last_op = NULL;
+ const char *probe_s = NULL;
+ gboolean is_probe = FALSE;
+ int log_rsc_err = LOG_WARNING;
CRM_CHECK(op != NULL, return I_NULL);
CRM_CHECK(op->rsc_id != NULL, return I_NULL);
@@ -1558,7 +1568,7 @@
}
}
- return I_NULL;
+ return TRUE;
}
char *
------------------------------
Message: 2
Date: Sun, 23 Apr 2006 12:23:34 -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 callbacks.c
Log Message:
Log the transition once (when we unpack it) rather than potentially many
times when we signal the CRM.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- actions.c 20 Apr 2006 09:00:05 -0000 1.23
+++ actions.c 23 Apr 2006 18:23:33 -0000 1.24
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.23 2006/04/20 09:00:05 andrew Exp $ */
+/* $Id: actions.c,v 1.24 2006/04/23 18:23:33 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -440,7 +440,7 @@
notify_crmd(crm_graph_t *graph)
{
HA_Message *cmd = NULL;
- int log_level = LOG_DEBUG;
+ int log_level = LOG_DEBUG_2;
const char *op = CRM_OP_TEABORT;
int pending_callbacks = num_cib_op_callbacks();
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- callbacks.c 21 Apr 2006 07:08:04 -0000 1.75
+++ callbacks.c 23 Apr 2006 18:23:33 -0000 1.76
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.75 2006/04/21 07:08:04 andrew Exp $ */
+/* $Id: callbacks.c,v 1.76 2006/04/23 18:23:33 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -221,7 +221,7 @@
start_global_timer(transition_timer,
transition_graph->transition_timeout);
trigger_graph();
- print_graph(LOG_DEBUG_2, transition_graph);
+ print_graph(LOG_DEBUG, transition_graph);
}
} else if(strcmp(op, CRM_OP_TE_HALT) == 0) {
------------------------------
Message: 3
Date: Sun, 23 Apr 2006 13:49:05 -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:
pe_utils.h
Log Message:
Dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pe_utils.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- pe_utils.h 22 Apr 2006 17:35:44 -0000 1.43
+++ pe_utils.h 23 Apr 2006 19:49:05 -0000 1.44
@@ -1,4 +1,4 @@
-/* $Id: pe_utils.h,v 1.43 2006/04/22 17:35:44 andrew Exp $ */
+/* $Id: pe_utils.h,v 1.44 2006/04/23 19:49:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -83,9 +83,6 @@
extern void print_color_details(
const char *pre_text, struct color_shared_s *color, gboolean details);
-extern void print_action(
- const char *pre_text, action_t *action, gboolean details);
-
extern void log_action(
unsigned int log_level, const char *pre_text, action_t *action,
gboolean details);
------------------------------
Message: 4
Date: Sun, 23 Apr 2006 13:50:19 -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 callbacks.c
Log Message:
TE Logging improvements
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- actions.c 23 Apr 2006 18:23:33 -0000 1.24
+++ actions.c 23 Apr 2006 19:50:19 -0000 1.25
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.24 2006/04/23 18:23:33 andrew Exp $ */
+/* $Id: actions.c,v 1.25 2006/04/23 19:50:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -55,7 +55,7 @@
static gboolean
te_pseudo_action(crm_graph_t *graph, crm_action_t *pseudo)
{
- crm_debug("Event handler: action %d executed", pseudo->id);
+ crm_info("Pseudo action %d confirmed", pseudo->id);
pseudo->confirmed = TRUE;
update_graph(graph, pseudo);
trigger_graph();
@@ -440,7 +440,7 @@
notify_crmd(crm_graph_t *graph)
{
HA_Message *cmd = NULL;
- int log_level = LOG_DEBUG_2;
+ int log_level = LOG_DEBUG;
const char *op = CRM_OP_TEABORT;
int pending_callbacks = num_cib_op_callbacks();
@@ -473,7 +473,7 @@
te_log_action(log_level, "Transition %d status: %s - %s",
graph->id, op, graph->abort_reason);
- print_graph(log_level, graph);
+ print_graph(LOG_DEBUG_2, graph);
cmd = create_request(
op, NULL, NULL, CRM_SYSTEM_DC, CRM_SYSTEM_TENGINE, NULL);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- callbacks.c 23 Apr 2006 18:23:33 -0000 1.76
+++ callbacks.c 23 Apr 2006 19:50:19 -0000 1.77
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.76 2006/04/23 18:23:33 andrew Exp $ */
+/* $Id: callbacks.c,v 1.77 2006/04/23 19:50:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -407,7 +407,7 @@
crm_err("Ignoring timeout while not in transition");
} else if(timer->reason == timeout_action_warn) {
- print_graph_action(
+ print_action(
LOG_WARNING,"Action missed its timeout", timer->action);
} else {
------------------------------
_______________________________________________
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 120
*********************************************
