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: lib by alan from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: crm by alan from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: linux-ha by alan from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Sun, 23 Apr 2006 18:01:22 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Project : linux-ha Module : lib Dir : linux-ha/lib/hbclient Modified Files: client_lib.c Log Message: Initialized some things which I'd missed initializing in the hbclient GSource code. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/hbclient/client_lib.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- client_lib.c 23 Apr 2006 22:07:06 -0000 1.38 +++ client_lib.c 24 Apr 2006 00:01:21 -0000 1.39 @@ -1,4 +1,4 @@ -/* $Id: client_lib.c,v 1.38 2006/04/23 22:07:06 alan Exp $ */ +/* $Id: client_lib.c,v 1.39 2006/04/24 00:01:21 alan Exp $ */ /* * client_lib: heartbeat API client side code * @@ -3230,8 +3230,8 @@ return ret1 && ret2; } -static -void G_llc_destroy_int(GSource* source) +static void +G_llc_destroy_int(GSource* source) { GLLclusterSource* s = (GLLclusterSource*)source; llc_private_t* pi; @@ -3251,19 +3251,22 @@ , gboolean (*dispatch)(ll_cluster_t* source_data,gpointer user_data) , gpointer userdata, GDestroyNotify notify) { - GSource * source = g_source_new(&G_llc_SourceFuncs - , sizeof(GLLclusterSource)); - GLLclusterSource* s = (GLLclusterSource*)source; + GSource * source; IPC_Channel* ch; + GLLclusterSource* s; + source = g_source_new(&G_llc_SourceFuncs , sizeof(GLLclusterSource)); if (source == NULL || api == NULL || api->llc_ops == NULL || (ch = api->llc_ops->ipcchan(api)) == NULL) { return NULL; } + + s = (GLLclusterSource*)source; s->magic2 = OURMAGIC; + s->hbchan = api; + s->dispatch = dispatch; (void)G_main_IPC_Channel_constructor(source, ch, userdata, notify); - s->dispatch = dispatch; g_source_set_priority(source, priority); g_source_set_can_recurse(source, can_recurse); ------------------------------ Message: 2 Date: Sun, 23 Apr 2006 18:04:05 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: crm by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Project : linux-ha Module : crm Dir : linux-ha/crm/crmd Modified Files: callbacks.c control.c crmd_callbacks.h Log Message: Changed Andrew's code to use the new Gsource for heartbeat API connections. This will eliminate some 3 minute waits observed in some versions of this code. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v retrieving revision 1.119 retrieving revision 1.120 diff -u -3 -r1.119 -r1.120 --- callbacks.c 23 Apr 2006 18:13:28 -0000 1.119 +++ callbacks.c 24 Apr 2006 00:04:05 -0000 1.120 @@ -54,21 +54,23 @@ G_main_set_trigger(source); gboolean -crmd_ha_msg_dispatch(IPC_Channel *channel, gpointer user_data) +crmd_ha_msg_dispatch(ll_cluster_t *cluster_conn, gpointer user_data) { gboolean stay_connected = TRUE; + IPC_Channel *channel = cluster_conn->llc_ops->ipcchan(cluster_conn); + crm_debug_3("Invoked"); - if(fsa_cluster_conn != NULL && IPC_ISRCONN(channel)) { - if(fsa_cluster_conn->llc_ops->msgready(fsa_cluster_conn) == 0) { + if(cluster_conn != NULL && IPC_ISRCONN(channel)) { + if(cluster_conn->llc_ops->msgready(cluster_conn) == 0) { crm_debug_2("no message ready yet"); } /* invoke the callbacks but dont block */ - fsa_cluster_conn->llc_ops->rcvmsg(fsa_cluster_conn, 0); + cluster_conn->llc_ops->rcvmsg(cluster_conn, 0); } - if (fsa_cluster_conn == NULL || channel->ch_status != IPC_CONNECT) { + if (cluster_conn == NULL || channel->ch_status != IPC_CONNECT) { if(is_set(fsa_input_register, R_HA_DISCONNECTED) == FALSE) { crm_crit("Lost connection to heartbeat service."); } else { =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v retrieving revision 1.126 retrieving revision 1.127 diff -u -3 -r1.126 -r1.127 --- control.c 20 Apr 2006 08:59:06 -0000 1.126 +++ control.c 24 Apr 2006 00:04:05 -0000 1.127 @@ -747,8 +747,8 @@ } crm_debug_3("Adding channel to mainloop"); - G_main_add_IPC_Channel( - G_PRIORITY_HIGH, hb_cluster->llc_ops->ipcchan(hb_cluster), + G_main_add_ll_cluster( + G_PRIORITY_HIGH, hb_cluster, FALSE, crmd_ha_msg_dispatch, hb_cluster /* userdata */, crmd_ha_connection_destroy); =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/crmd_callbacks.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- crmd_callbacks.h 17 Oct 2005 19:13:47 -0000 1.11 +++ crmd_callbacks.h 24 Apr 2006 00:04:05 -0000 1.12 @@ -30,7 +30,7 @@ */ extern gboolean crmd_ha_msg_dispatch( - IPC_Channel *channel, gpointer user_data); + ll_cluster_t *cluster_conn, gpointer user_data); extern void crmd_ha_msg_callback( HA_Message * msg, void* private_data); ------------------------------ Message: 3 Date: Sun, 23 Apr 2006 20:32:17 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Module : linux-ha Dir : linux-ha Modified Files: heartbeat.spec.in Log Message: Put in change log for 2.0.5 =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v retrieving revision 1.168 retrieving revision 1.169 diff -u -3 -r1.168 -r1.169 --- heartbeat.spec.in 14 Apr 2006 08:06:11 -0000 1.168 +++ heartbeat.spec.in 24 Apr 2006 02:32:17 -0000 1.169 @@ -1,4 +1,4 @@ -# $Id: heartbeat.spec.in,v 1.168 2006/04/14 08:06:11 zhenh Exp $ +# $Id: heartbeat.spec.in,v 1.169 2006/04/24 02:32:17 alan Exp $ # Workaround for a change in RPM 4.1.x; needs proper fixing soon! ##%define _unpackaged_files_terminate_build 0 @@ -78,6 +78,31 @@ implementing any number of interfaces. %changelog +* Sun Apr 23 2006 Alan Robertson <[EMAIL PROTECTED]> (see doc/AUTHORS file) ++ Version 2.0.5 - significant bug fixes and a few feature deficits fixed + + various portability fixes + + enable GUI to run with pygtk 2.4 + + significant GUI improvements and speedups + + numerous logging improvements (generally much quieter) + + speed up CIB processing by writing to CIB asynchronously + + add CIB on-disk checksums + + removed dependency on openssl + + added "failure stickiness" to the CIB/CRM + + Several fixes to the membership code + + We now log all output from resource agents + + fixed STONITHd memory leaks. + + Added an OCF RA for Xen guests + + Added email alerts to ldirectord + + Master/slave now works + + Improvements to the haresources2cib upgrade tool + + Several fixes to cibadmin + + Validate the CIB against the DTD on startup, and other times... + + Fix some autoadd-related bugs + + Added Chinese support to the GUI + + Added a new (untested) daemon to replace and generalize ipfail + + Significant improvements to CIM model, including modifying things + + * Mon Feb 27 2006 Alan Robertson <[EMAIL PROTECTED]> (see doc/AUTHORS file) + Version 2.0.4 - Bug fix release - worth getting these updates + Fixed cpu loop for LRM ------------------------------ _______________________________________________ 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 29, Issue 124 *********************************************