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])
----------------------------------------------------------------------
Message: 1
Date: Wed, 11 Jan 2006 06:10:21 -0700 (MST)
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/common
Modified Files:
xml.c
Log Message:
Increase logging of failed xml patches
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- xml.c 7 Jan 2006 21:23:11 -0000 1.49
+++ xml.c 11 Jan 2006 13:10:21 -0000 1.50
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.49 2006/01/07 21:23:11 andrew Exp $ */
+/* $Id: xml.c,v 1.50 2006/01/11 13:10:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1574,7 +1574,6 @@
" saw %d", root_nodes_seen);
result = FALSE;
-#if CRM_DEV_BUILD
} else if(result) {
crm_debug_2("Verification Phase");
intermediate = diff_xml_object(old, *new, FALSE);
@@ -1582,18 +1581,17 @@
if(diff_of_diff != NULL) {
crm_warn("Diff application failed!");
/* log_xml_diff(LOG_DEBUG, diff_of_diff,
"diff:diff_of_diff"); */
- log_xml_diff(LOG_DEBUG, intermediate,
"diff:actual_diff");
+ log_xml_diff(LOG_INFO, intermediate,
"diff:actual_diff");
result = FALSE;
}
crm_free(diff_of_diff);
crm_free(intermediate);
-#endif
diff_of_diff = NULL;
intermediate = NULL;
}
if(result == FALSE) {
- log_xml_diff(LOG_DEBUG, diff, "diff:input_diff");
+ log_xml_diff(LOG_INFO, diff, "diff:input_diff");
log_data_element("diff:input", NULL, LOG_DEBUG_2, 0, old, TRUE);
/* CRM_DEV_ASSERT(diff_of_diff != NULL); */
@@ -2129,7 +2127,7 @@
if(parent != NULL) {
nvpair_list = find_xml_node(parent, XML_TAG_ATTRS, FALSE);
if(nvpair_list == NULL) {
- crm_debug("No attributes in %s",
+ crm_debug_2("No attributes in %s",
crm_element_name(parent));
crm_log_xml_debug_2(
parent,"No attributes for resource op");
------------------------------
Message: 2
Date: Wed, 11 Jan 2006 06:18:04 -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/cib
Modified Files:
callbacks.c
Log Message:
Logging enhancements.
If no "name" is provided during registration, use the PID from the client
process.
Now that name is always populated, use it in all logging instead of the uuid.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- callbacks.c 10 Jan 2006 13:50:34 -0000 1.87
+++ callbacks.c 11 Jan 2006 13:18:03 -0000 1.88
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.87 2006/01/10 13:50:34 andrew Exp $ */
+/* $Id: callbacks.c,v 1.88 2006/01/11 13:18:03 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -391,6 +391,10 @@
crm_err("Receieved call from unknown source. Discarding.");
return FALSE;
}
+
+ if(cib_client->name == NULL) {
+ cib_client->name = crm_itoa(channel->farside_pid);
+ }
crm_debug_2("Callback for %s on %s channel",
cib_client->id, cib_client->channel_name);
@@ -412,8 +416,8 @@
op = cl_get_string(op_request, F_CIB_OPERATION);
- crm_info("Operation %s from client %s/%s",
- op, cib_client->id, cib_client->channel_name);
+ crm_info("Processing %s operation from %s/%s",
+ op, cib_client->name, cib_client->channel_name);
crm_log_message_adv(LOG_MSG, "Client[inbound]", op_request);
lpc++;
@@ -568,11 +572,11 @@
ha_msg_add(forward_msg, F_CIB_DELEGATED, cib_our_uname);
if(host != NULL) {
- crm_debug("Forwarding %s op to %s", op, host);
+ crm_debug_2("Forwarding %s op to %s", op, host);
send_ha_message(hb_conn, forward_msg, host, FALSE);
} else {
- crm_debug("Forwarding %s op to master instance", op);
+ crm_debug_2("Forwarding %s op to master instance", op);
send_ha_message(hb_conn, forward_msg, NULL, FALSE);
}
@@ -584,8 +588,8 @@
/* keep track of the request so we can time it
* out if required
*/
- crm_debug("Registering delegated call from %s",
- cib_client->id);
+ crm_debug_2("Registering delegated call from %s",
+ cib_client->id);
cib_client->delegated_calls = g_list_append(
cib_client->delegated_calls, forward_msg);
} else {
@@ -717,9 +721,9 @@
&diff_add_admin_epoch, &diff_add_epoch,
&diff_add_updates,
&diff_del_admin_epoch, &diff_del_epoch,
&diff_del_updates);
- crm_debug("Sending update diff %d.%d.%d -> %d.%d.%d",
- diff_del_admin_epoch,diff_del_epoch,diff_del_updates,
- diff_add_admin_epoch,diff_add_epoch,diff_add_updates);
+ crm_debug_2("Sending update diff %d.%d.%d -> %d.%d.%d",
+
diff_del_admin_epoch,diff_del_epoch,diff_del_updates,
+
diff_add_admin_epoch,diff_add_epoch,diff_add_updates);
ha_msg_add(op_bcast, F_CIB_ISREPLY, originator);
ha_msg_add(op_bcast, F_CIB_GLOBAL_UPDATE, XML_BOOLEAN_TRUE);
@@ -734,7 +738,7 @@
crm_debug_2("Sending replies");
if(from_peer && originator != NULL) {
/* send reply via HA to originating node */
- crm_debug("Sending request result to originator only");
+ crm_debug_2("Sending request result to originator
only");
ha_msg_add(op_reply, F_CIB_ISREPLY, originator);
send_ha_message(hb_conn, op_reply, originator, FALSE);
}
@@ -1109,10 +1113,9 @@
keep_connection = FALSE;
} else if(channel->ch_status == IPC_DISCONNECT && cib_client != NULL) {
- crm_debug("Cleaning up after %s channel disconnect from client
(%p) %s/%s",
- cib_client->channel_name, cib_client,
- crm_str(cib_client->id), crm_str(cib_client->name));
-
+ crm_debug("Cleaning up after client disconnect: %s/%s",
+ crm_str(cib_client->name), cib_client->channel_name);
+
if(cib_client->id != NULL) {
g_hash_table_remove(client_list, cib_client->id);
@@ -1335,7 +1338,7 @@
{
int rc = 0;
oc_ev_t *ccm_token = (oc_ev_t*)user_data;
- crm_debug("received callback");
+ crm_debug_2("received callback");
rc = oc_ev_handle_event(ccm_token);
if(0 == rc) {
return TRUE;
@@ -1365,7 +1368,7 @@
instance = membership->m_instance;
}
- crm_info("Process CCM event=%s (id=%d)",
+ crm_debug("Process CCM event=%s (id=%d)",
ccm_event_name(event), instance);
switch(event) {
@@ -1378,7 +1381,7 @@
update_id = TRUE;
break;
case OC_EV_MS_NOT_PRIMARY:
- crm_debug("Ignoring transitional CCM event: %s",
+ crm_debug_2("Ignoring transitional CCM event: %s",
ccm_event_name(event));
break;
case OC_EV_MS_EVICTED:
@@ -1416,9 +1419,9 @@
the_cib,XML_ATTR_HAVE_QUORUM,XML_BOOLEAN_FALSE);
}
- crm_info("Quorum %s after event=%s (id=%d)",
- cib_have_quorum?"(re)attained":"lost",
- ccm_event_name(event), instance);
+ crm_debug("Quorum %s after event=%s (id=%d)",
+ cib_have_quorum?"(re)attained":"lost",
+ ccm_event_name(event), instance);
if(ccm_membership == NULL) {
ccm_membership = g_hash_table_new_full(
@@ -1432,7 +1435,7 @@
for(lpc = 0; lpc < members; lpc++) {
oc_node_t a_node =
membership->m_array[lpc+offset];
char *uname = crm_strdup(a_node.node_uname);
- crm_info("Added: %s", uname);
+ crm_info("New peer: %s", uname);
g_hash_table_replace(
ccm_membership, uname, uname);
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 20
********************************************
