Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Aug 2006 03:14:46 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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
Log Message:
Logging updates - generally make the PE quieter
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- actions.c 14 Aug 2006 09:00:56 -0000 1.36
+++ actions.c 14 Aug 2006 09:14:45 -0000 1.37
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.36 2006/08/14 09:00:56 andrew Exp $ */
+/* $Id: actions.c,v 1.37 2006/08/14 09:14:45 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_info("Pseudo action %d confirmed", pseudo->id);
+ crm_info("Pseudo action %d fired and confirmed", pseudo->id);
pseudo->confirmed = TRUE;
update_graph(graph, pseudo);
trigger_graph();
@@ -475,7 +475,7 @@
}
te_log_action(log_level, "Transition %d status: %s - %s",
- graph->id, op, graph->abort_reason);
+ graph->id, op, crm_str(graph->abort_reason));
print_graph(LOG_DEBUG_3, graph);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- callbacks.c 14 Aug 2006 09:10:56 -0000 1.88
+++ callbacks.c 14 Aug 2006 09:14:45 -0000 1.89
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.88 2006/08/14 09:10:56 andrew Exp $ */
+/* $Id: callbacks.c,v 1.89 2006/08/14 09:14:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -243,7 +243,7 @@
} else {
destroy_graph(transition_graph);
- crm_debug("Read graph from %s based on %s", graph_file,
graph_input);
+ crm_debug("Processing graph derived from %s",
graph_input);
if(graph_file == NULL) {
transition_graph = unpack_graph(xml_data);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/events.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- events.c 14 Aug 2006 08:52:30 -0000 1.22
+++ events.c 14 Aug 2006 09:14:45 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Id: events.c,v 1.22 2006/08/14 08:52:30 andrew Exp $ */
+/* $Id: events.c,v 1.23 2006/08/14 09:14:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -140,14 +140,14 @@
/* Transient node attribute changes... */
event_node = crm_element_value(node_state, XML_ATTR_ID);
- crm_debug("Processing state update from %s", event_node);
- crm_log_xml_debug_3(node_state,"Processing");
+ crm_debug_2("Processing state update from %s", event_node);
+ crm_log_xml_debug_3(node_state, "Processing");
attrs = find_xml_node(
node_state, XML_TAG_TRANSIENT_NODEATTRS, FALSE);
if(attrs != NULL) {
- crm_info("Aborting on "XML_TAG_TRANSIENT_NODEATTRS"
changes");
+ crm_info("Aborting on "XML_TAG_TRANSIENT_NODEATTRS"
changes for %s", event_node);
abort_transition(INFINITY, tg_restart,
XML_TAG_TRANSIENT_NODEATTRS, attrs);
}
@@ -162,8 +162,7 @@
xml_child_iter(
rsc, rsc_op,
- crm_log_xml_debug_3(
- rsc_op, "Processing resource update");
+ crm_log_xml_debug_3(rsc_op, "Processing
resource update");
process_graph_event(rsc_op, event_node);
);
);
@@ -174,7 +173,6 @@
if(safe_str_eq(ccm_state, XML_BOOLEAN_FALSE)
|| safe_str_eq(crmd_state, CRMD_JOINSTATE_DOWN)) {
crm_action_t *shutdown = NULL;
- crm_debug_3("A shutdown we requested?");
shutdown = match_down_event(0, event_node, NULL);
if(shutdown != NULL) {
@@ -182,9 +180,8 @@
trigger_graph();
} else {
- crm_info("Stonith/shutdown event not matched");
- abort_transition(INFINITY, tg_restart,
- "Node failure", node_state);
+ crm_info("Stonith/shutdown of %s not matched",
event_node);
+ abort_transition(INFINITY, tg_restart, "Node
failure", node_state);
}
fail_incompletable_actions(transition_graph,
event_node);
}
@@ -192,9 +189,8 @@
shutdown = 0;
ha_msg_value_int(node_state, XML_CIB_ATTR_SHUTDOWN, &shutdown);
if(shutdown != 0) {
- crm_info("Aborting on "XML_CIB_ATTR_SHUTDOWN"
attribute");
- abort_transition(INFINITY, tg_restart,
- "Shutdown request", node_state);
+ crm_info("Aborting on "XML_CIB_ATTR_SHUTDOWN" attribute
for %s", event_node);
+ abort_transition(INFINITY, tg_restart, "Shutdown
request", node_state);
}
);
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 03:14:46 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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/pengine
Modified Files:
clone.c unpack.c utils.c
Log Message:
Logging updates - generally make the PE quieter
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/clone.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- clone.c 14 Aug 2006 09:06:32 -0000 1.6
+++ clone.c 14 Aug 2006 09:14:45 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: clone.c,v 1.6 2006/08/14 09:06:32 andrew Exp $ */
+/* $Id: clone.c,v 1.7 2006/08/14 09:14:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -151,10 +151,10 @@
clone_data->ordered = TRUE;
}
- crm_debug("Options for %s", rsc->id);
- crm_debug("\tClone max: %d", clone_data->clone_max);
- crm_debug("\tClone node max: %d", clone_data->clone_node_max);
- crm_debug("\tClone is unique: %s", rsc->globally_unique?"true":"false");
+ crm_debug_2("Options for %s", rsc->id);
+ crm_debug_2("\tClone max: %d", clone_data->clone_max);
+ crm_debug_2("\tClone node max: %d", clone_data->clone_node_max);
+ crm_debug_2("\tClone is unique: %s",
rsc->globally_unique?"true":"false");
clone_data->xml_obj_child = find_xml_node(
xml_obj, XML_CIB_TAG_GROUP, FALSE);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/unpack.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- unpack.c 14 Aug 2006 09:06:32 -0000 1.16
+++ unpack.c 14 Aug 2006 09:14:45 -0000 1.17
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.16 2006/08/14 09:06:32 andrew Exp $ */
+/* $Id: unpack.c,v 1.17 2006/08/14 09:14:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -84,26 +84,26 @@
value = pe_pref(data_set->config_hash, "default-resource-stickiness");
data_set->default_resource_stickiness = char2score(value);
- crm_info("Default stickiness: %d",
+ crm_debug("Default stickiness: %d",
data_set->default_resource_stickiness);
value = pe_pref(data_set->config_hash,
"default-resource-failure-stickiness");
data_set->default_resource_fail_stickiness = char2score(value);
- crm_info("Default failure stickiness: %d",
+ crm_debug("Default failure stickiness: %d",
data_set->default_resource_fail_stickiness);
value = pe_pref(data_set->config_hash, "stonith-enabled");
cl_str_to_boolean(value, &data_set->stonith_enabled);
- crm_info("STONITH of failed nodes is %s",
+ crm_debug("STONITH of failed nodes is %s",
data_set->stonith_enabled?"enabled":"disabled");
data_set->stonith_action = pe_pref(data_set->config_hash,
"stonith-action");
- crm_info("STONITH will %s nodes", data_set->stonith_action);
+ crm_debug("STONITH will %s nodes", data_set->stonith_action);
value = pe_pref(data_set->config_hash, "symmetric-cluster");
cl_str_to_boolean(value, &data_set->symmetric_cluster);
if(data_set->symmetric_cluster) {
- crm_info("Cluster is symmetric"
+ crm_debug("Cluster is symmetric"
" - resources can run anywhere by default");
}
@@ -120,10 +120,10 @@
switch (data_set->no_quorum_policy) {
case no_quorum_freeze:
- crm_info("On loss of CCM Quorum: Freeze resources");
+ crm_debug("On loss of CCM Quorum: Freeze resources");
break;
case no_quorum_stop:
- crm_info("On loss of CCM Quorum: Stop ALL resources");
+ crm_debug("On loss of CCM Quorum: Stop ALL resources");
break;
case no_quorum_ignore:
crm_notice("On loss of CCM Quorum: Ignore");
@@ -132,22 +132,22 @@
value = pe_pref(data_set->config_hash, "stop-orphan-resources");
cl_str_to_boolean(value, &data_set->stop_rsc_orphans);
- crm_info("Orphan resources are %s",
+ crm_debug("Orphan resources are %s",
data_set->stop_rsc_orphans?"stopped":"ignored");
value = pe_pref(data_set->config_hash, "stop-orphan-actions");
cl_str_to_boolean(value, &data_set->stop_action_orphans);
- crm_info("Orphan resource actions are %s",
+ crm_debug("Orphan resource actions are %s",
data_set->stop_action_orphans?"stopped":"ignored");
value = pe_pref(data_set->config_hash, "remove-after-stop");
cl_str_to_boolean(value, &data_set->remove_after_stop);
- crm_info("Stopped resources are removed from the status section: %s",
+ crm_debug("Stopped resources are removed from the status section: %s",
data_set->remove_after_stop?"true":"false");
value = pe_pref(data_set->config_hash, "is-managed-default");
cl_str_to_boolean(value, &data_set->is_managed_default);
- crm_info("By default resources are %smanaged",
+ crm_debug("By default resources are %smanaged",
data_set->is_managed_default?"":"not ");
return TRUE;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/utils.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- utils.c 14 Aug 2006 09:06:32 -0000 1.10
+++ utils.c 14 Aug 2006 09:14:45 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.10 2006/08/14 09:06:32 andrew Exp $ */
+/* $Id: utils.c,v 1.11 2006/08/14 09:14:45 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1062,8 +1062,8 @@
resource_node_score(resource_t *rsc, node_t *node, int score, const char *tag)
{
node_t *match = NULL;
- crm_debug("Setting %s for %s on %s: %d",
- tag, rsc->id, node->details->uname, score);
+ crm_debug_2("Setting %s for %s on %s: %d",
+ tag, rsc->id, node->details->uname, score);
match = pe_find_node_id(rsc->allowed_nodes, node->details->id);
if(match == NULL) {
match = node_copy(node);
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 23
********************************************
