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: lib by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: tools by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 21 Apr 2006 01:08:05 -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/transition
Modified Files:
graph.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/transition/graph.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- graph.c 19 Apr 2006 12:24:59 -0000 1.9
+++ graph.c 21 Apr 2006 07:08:04 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Id: graph.c,v 1.9 2006/04/19 12:24:59 andrew Exp $ */
+/* $Id: graph.c,v 1.10 2006/04/21 07:08:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -76,27 +76,27 @@
crm_debug_3("Processing action %d", action->id);
if(action->id == action_id) {
- crm_info("Confirmed: Action %d of Synapse %d",
+ crm_debug_2("Confirmed: Action %d of Synapse %d",
action_id, synapse->id);
action->confirmed = TRUE;
updates = TRUE;
} else if(action->confirmed == FALSE) {
is_confirmed = FALSE;
- crm_debug_2("Synapse %d still not confirmed after
action %d",
+ crm_debug_3("Synapse %d still not confirmed after
action %d",
synapse->id, action_id);
}
);
if(is_confirmed && synapse->confirmed == FALSE) {
- crm_debug("Confirmed: Synapse %d", synapse->id);
+ crm_debug_2("Confirmed: Synapse %d", synapse->id);
synapse->confirmed = TRUE;
updates = TRUE;
}
if(updates) {
- crm_debug_2("Updated synapse %d", synapse->id);
+ crm_debug_3("Updated synapse %d", synapse->id);
}
return updates;
}
@@ -173,12 +173,11 @@
action->executed = TRUE;
if(action->type == action_type_pseudo){
- te_log_action(LOG_INFO,
- "Executing pseudo-event: %d", action->id);
+ crm_debug_2("Executing pseudo-event: %d", action->id);
return graph_fns->pseudo(graph, action);
} else if(action->type == action_type_rsc) {
- te_log_action(LOG_INFO, "Executing rsc-event: %d", action->id);
+ crm_debug_2("Executing rsc-event: %d", action->id);
return graph_fns->rsc(graph, action);
} else if(action->type == action_type_crm) {
@@ -187,12 +186,12 @@
CRM_CHECK(task != NULL, return FALSE);
if(safe_str_eq(task, CRM_OP_FENCE)) {
- te_log_action(LOG_INFO, "Executing STONITH-event: %d",
+ crm_info("Executing STONITH-event: %d",
action->id);
return graph_fns->stonith(graph, action);
}
- te_log_action(LOG_INFO, "Executing crm-event: %d", action->id);
+ crm_info("Executing crm-event: %d", action->id);
return graph_fns->crmd(graph, action);
}
@@ -209,7 +208,7 @@
CRM_CHECK(synapse->ready, return FALSE);
CRM_CHECK(synapse->confirmed == FALSE, return TRUE);
- crm_debug("Synapse %d fired", synapse->id);
+ crm_debug_2("Synapse %d fired", synapse->id);
synapse->executed = TRUE;
slist_iter(
action, crm_action_t, synapse->actions, lpc,
------------------------------
Message: 2
Date: Fri, 21 Apr 2006 01:08: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/tengine
Modified Files:
callbacks.c events.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- callbacks.c 19 Apr 2006 12:24:59 -0000 1.74
+++ callbacks.c 21 Apr 2006 07:08:04 -0000 1.75
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.74 2006/04/19 12:24:59 andrew Exp $ */
+/* $Id: callbacks.c,v 1.75 2006/04/21 07:08:04 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, transition_graph);
+ print_graph(LOG_DEBUG_2, transition_graph);
}
} else if(strcmp(op, CRM_OP_TE_HALT) == 0) {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- events.c 11 Apr 2006 07:36:49 -0000 1.13
+++ events.c 21 Apr 2006 07:08:04 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.13 2006/04/11 07:36:49 andrew Exp $ */
+/* $Id: events.c,v 1.14 2006/04/21 07:08:04 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -258,7 +258,7 @@
}
- crm_debug("Matched action (%d) %s", action->id, this_event);
+ crm_debug_2("Matched action (%d) %s", action->id, this_event);
CRM_CHECK(decode_transition_magic(
magic, &update_te_uuid,
@@ -266,19 +266,21 @@
if(transition_i == -1) {
/* we never expect these - recompute */
- crm_err("Detected an action initiated outside of a transition");
+ crm_err("Detected action %s initiated outside of a transition",
+ this_event);
crm_log_message(LOG_ERR, event);
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_info("Detected action %s from a different transitioner:"
+ " %s vs. %s", this_event, update_te_uuid, te_uuid);
crm_log_message(LOG_INFO, event);
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_warn("Detected an action %s from a different transition:"
+ " %d vs. %d", this_event, transition_i,
+ transition_graph->id);
crm_log_message(LOG_INFO, event);
return -4;
}
@@ -289,13 +291,13 @@
target_rc_s = g_hash_table_lookup(action->params,XML_ATTR_TE_TARGET_RC);
if(target_rc_s != NULL) {
- crm_debug("Target rc: %s vs. %d", target_rc_s, op_rc_i);
+ crm_debug_2("Target rc: %s vs. %d", target_rc_s, op_rc_i);
target_rc = crm_parse_int(target_rc_s, NULL);
if(target_rc == op_rc_i) {
crm_debug_2("Target rc: == %d", op_rc_i);
if(op_status_i != LRM_OP_DONE) {
- crm_debug("Re-mapping op status to"
- " LRM_OP_DONE for %s", update_event);
+ crm_debug_2("Re-mapping op status to"
+ " LRM_OP_DONE for %s",update_event);
op_status_i = LRM_OP_DONE;
}
} else {
------------------------------
Message: 3
Date: Fri, 21 Apr 2006 01:08:30 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
.cvsignore
Log Message:
new daemon
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- .cvsignore 9 Apr 2006 12:50:04 -0000 1.5
+++ .cvsignore 21 Apr 2006 07:08:30 -0000 1.6
@@ -14,3 +14,5 @@
haresources2cib.py
attrd
attrd_updater
+pingd
+
------------------------------
_______________________________________________
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 111
*********************************************
