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)
3. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Sun, 9 Jul 2006 03:54:10 -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/cib
Modified Files:
main.c
Log Message:
Now that the memory leak is located:
- no need to call resume_io() to ensure IPC related allocations
happen in send_(ipc|ha)_message
- no need to run the stats so often
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- main.c 7 Jul 2006 21:26:29 -0000 1.54
+++ main.c 9 Jul 2006 09:54:09 -0000 1.55
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.54 2006/07/07 21:26:29 andrew Exp $ */
+/* $Id: main.c,v 1.55 2006/07/09 09:54:09 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -155,7 +155,7 @@
}
unsigned long cib_num_ops = 0;
-const char *cib_stat_interval = "10s";
+const char *cib_stat_interval = "10min";
unsigned long cib_num_local = 0, cib_num_updates = 0, cib_num_fail = 0;
unsigned long cib_bad_connects = 0, cib_num_timeouts = 0;
longclock_t cib_call_time = 0;
------------------------------
Message: 2
Date: Sun, 9 Jul 2006 03:54:10 -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/common
Modified Files:
ipc.c
Log Message:
Now that the memory leak is located:
- no need to call resume_io() to ensure IPC related allocations
happen in send_(ipc|ha)_message
- no need to run the stats so often
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/ipc.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ipc.c 6 Jul 2006 13:30:23 -0000 1.25
+++ ipc.c 9 Jul 2006 09:54:09 -0000 1.26
@@ -1,4 +1,4 @@
-/* $Id: ipc.c,v 1.25 2006/07/06 13:30:23 andrew Exp $ */
+/* $Id: ipc.c,v 1.26 2006/07/09 09:54:09 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -102,7 +102,7 @@
ipc = hb_conn->llc_ops->ipcchan(hb_conn);
}
if(ipc != NULL) {
- ipc->ops->resume_io(ipc);
+/* ipc->ops->resume_io(ipc); */
send_q = ipc->send_queue;
}
if(send_q != NULL) {
@@ -156,7 +156,7 @@
CRM_CHECK(ipc_client->send_queue->current_qlen <
ipc_client->send_queue->max_qlen, ;);
}
}
- ipc_client->ops->resume_io(ipc_client);
+/* ipc_client->ops->resume_io(ipc_client); */
crm_log_message_adv(all_is_good?LOG_MSG:LOG_WARNING,"IPC[outbound]",msg);
crm_diff_mem_stats(LOG_DEBUG, LOG_DEBUG, __PRETTY_FUNCTION__, NULL,
&saved_stats);
------------------------------
Message: 3
Date: Sun, 9 Jul 2006 03:55:58 -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/cib
Modified Files:
callbacks.c
Log Message:
Fix incrimenting of the update counter, I had missed some cases where it
should not have been incrimented
- this got broken while i was rearranging things to make memory leak
detection easier
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -3 -r1.138 -r1.139
--- callbacks.c 8 Jul 2006 13:45:23 -0000 1.138
+++ callbacks.c 9 Jul 2006 09:55:57 -0000 1.139
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.138 2006/07/08 13:45:23 andrew Exp $ */
+/* $Id: callbacks.c,v 1.139 2006/07/09 09:55:57 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -793,8 +793,8 @@
client_obj = g_hash_table_lookup(
client_list, client_id);
} else {
- crm_debug("No client to sent the response to."
- " F_CIB_CLIENTID not set.");
+ crm_debug_2("No client to sent the response to."
+ " F_CIB_CLIENTID not set.");
}
crm_debug_3("Sending callback to request originator");
@@ -814,7 +814,7 @@
local_rc = send_via_callback_channel(client_reply, client_id);
}
- if(local_rc != cib_ok) {
+ if(local_rc != cib_ok && client_obj != NULL) {
crm_warn("%sSync reply to %s failed: %s",
sync_reply?"":"A-",
client_obj?client_obj->name:"<unknown>",
cib_error2string(local_rc));
@@ -1320,12 +1320,27 @@
update_counters(__FILE__, __FUNCTION__, result_cib);
- if(section == NULL && cib_server_ops[call_type].fn ==
cib_process_replace) {
+ if(global_update) {
/* skip */
+ CRM_CHECK(call_type == 4 || call_type == 11,
+ crm_err("Call type: %d", call_type);
+ crm_log_message(LOG_ERR, request));
+ crm_debug_2("Skipping update: global replace");
+
} else if(cib_server_ops[call_type].fn ==
cib_process_change
&& (call_options & cib_inhibit_bcast)) {
/* skip */
+ crm_debug_2("Skipping update: inhibit
broadcast");
+
} else {
+ const char *op = cl_get_string(
+ request, F_CIB_OPERATION);
+ const char *originator = cl_get_string(
+ request, F_ORIG);
+
+ crm_debug_2("Upping counter: %s %s %d %d",
+ op, originator, call_options,
+ global_update);
cib_update_counter(result_cib,
XML_ATTR_NUMUPDATES, FALSE);
}
------------------------------
_______________________________________________
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 32, Issue 36
********************************************
