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: ldirectord by horms from
([email protected])
2. Linux-HA CVS: ldirectord by horms from
([email protected])
3. Linux-HA CVS: heartbeat by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 30 Jan 2006 17:49:59 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
ldirectord
Log Message:
Make sure ldirectord does not detatch from the terminal in debug mode. Bug
#1062. Thanks to Andrew Shoemaker
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- ldirectord 31 Jan 2006 00:38:02 -0000 1.130
+++ ldirectord 31 Jan 2006 00:49:59 -0000 1.131
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.130 2006/01/31 00:38:02 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.131 2006/01/31 00:49:59 horms Exp $)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -634,7 +634,7 @@
}
# Run as daemon
- if ($SUPERVISED || defined $opt_d) {
+ if ($SUPERVISED || $opt_d) {
&ld_log("Starting Linux Director v$VERSION with pid: $$");
} else {
&ld_log("Starting Linux Director v$VERSION as daemon");
------------------------------
Message: 2
Date: Mon, 30 Jan 2006 17:50:34 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Make sure ldirectord does not detatch from the terminal in debug mode. Bug
#1062. Thanks to Andrew Shoemaker. Sync with Head 1.131
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.77.2.40
retrieving revision 1.77.2.41
diff -u -3 -r1.77.2.40 -r1.77.2.41
--- ldirectord 31 Jan 2006 00:46:16 -0000 1.77.2.40
+++ ldirectord 31 Jan 2006 00:50:33 -0000 1.77.2.41
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.40 2006/01/31 00:46:16 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.41 2006/01/31 00:50:33 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -634,7 +634,7 @@
}
# Run as daemon
- if ($SUPERVISED || defined $opt_d) {
+ if ($SUPERVISED || $opt_d) {
&ld_log("Starting Linux Director v$VERSION with pid: $$");
} else {
&ld_log("Starting Linux Director v$VERSION as daemon");
------------------------------
Message: 3
Date: Mon, 30 Jan 2006 21:30:38 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
hb_api.c heartbeat.c
Log Message:
Put in code to detect and log whenever heartbeat functions take too long or are
delayed too long...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/hb_api.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- hb_api.c 21 Dec 2005 02:34:32 -0000 1.147
+++ hb_api.c 31 Jan 2006 04:30:37 -0000 1.148
@@ -1,4 +1,4 @@
-/* $Id: hb_api.c,v 1.147 2005/12/21 02:34:32 gshi Exp $ */
+/* $Id: hb_api.c,v 1.148 2006/01/31 04:30:37 alan Exp $ */
/*
* hb_api: Server-side heartbeat API code
*
@@ -1230,6 +1230,8 @@
, chan, FALSE
, APIclients_input_dispatch
, client, G_remove_client);
+ G_main_setmaxdispatchdelay((GSource*)client->gsource, 500);
+ G_main_setmaxdispatchtime((GSource*)client->gsource, 10);
if (ANYDEBUG) {
cl_log(LOG_DEBUG
, "client->gsource = 0x%lx"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -3 -r1.480 -r1.481
--- heartbeat.c 25 Jan 2006 16:41:36 -0000 1.480
+++ heartbeat.c 31 Jan 2006 04:30:37 -0000 1.481
@@ -2,7 +2,7 @@
* TODO:
* 1) Man page update
*/
-/* $Id: heartbeat.c,v 1.480 2006/01/25 16:41:36 alan Exp $ */
+/* $Id: heartbeat.c,v 1.481 2006/01/31 04:30:37 alan Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -721,6 +721,9 @@
FifoChildSource = G_main_add_IPC_Channel(PRI_FIFOMSG
, fifochildipc[P_READFD]
, FALSE, FIFO_child_msg_dispatch, NULL, NULL);
+ G_main_setmaxdispatchdelay((GSource*)FifoChildSource, 2000);
+ G_main_setmaxdispatchtime((GSource*)FifoChildSource, 10);
+
return HA_OK;
}
@@ -1385,21 +1388,26 @@
/* Child I/O processes */
for(j = 0; j < nummedia; j++) {
+ GCHSource* s;
/*
* We cannot share a socket between the write and read
* children, though it might sound like it would work ;-)
*/
/* Connect up the write child IPC channel... */
- G_main_add_IPC_Channel(PRI_CLUSTERMSG
+ s = G_main_add_IPC_Channel(PRI_CLUSTERMSG
, sysmedia[j]->wchan[P_WRITEFD], FALSE
, NULL, sysmedia+j, NULL);
+ G_main_setmaxdispatchdelay((GSource*)s, 50);
+ G_main_setmaxdispatchtime((GSource*)s, 10);
/* Connect up the read child IPC channel... */
G_main_add_IPC_Channel(PRI_CLUSTERMSG
, sysmedia[j]->rchan[P_WRITEFD], FALSE
, read_child_dispatch, sysmedia+j, NULL);
+ G_main_setmaxdispatchdelay((GSource*)s, 50);
+ G_main_setmaxdispatchtime((GSource*)s, 10);
}
@@ -1735,6 +1743,8 @@
regsource = G_main_add_IPC_WaitConnection(PRI_APIREGISTER, regwchan
, NULL, FALSE, APIregistration_dispatch, NULL, NULL);
+ G_main_setmaxdispatchdelay((GSource*)regsource, 500);
+ G_main_setmaxdispatchtime((GSource*)regsource, 10);
if (regsource == NULL) {
@@ -3752,6 +3762,8 @@
const char* destnode = NULL;
long i;
int startindex = (long) data;
+ GSource * gs;
+ guint id;
if (get_reqnodes_reply){
@@ -3801,8 +3813,13 @@
send_cluster_msg(msg);
- Gmain_timeout_add(1000, send_reqnodes_msg, (gpointer)i);
-
+ id = Gmain_timeout_add(1000, send_reqnodes_msg, (gpointer)i);
+ gs = g_main_context_find_source_by_id(NULL, id);
+
+ if (gs) {
+ G_main_setmaxdispatchdelay(gs, 100);
+ G_main_setmaxdispatchtime(gs, 10);
+ }
return FALSE;
}
@@ -5095,11 +5112,16 @@
/* THIS IS RESOURCE WORK! FIXME */
/* IS THIS RIGHT??? FIXME ?? */
if (DoManageResources) {
+ guint id;
+ GSource * gs;
send_local_status();
-
(void)CauseShutdownRestart;
- Gmain_timeout_add(2000 ,
CauseShutdownRestart, NULL);
-
+ id = Gmain_timeout_add(2000,
CauseShutdownRestart,NULL);
+ gs =
g_main_context_find_source_by_id(NULL, id);
+ if (gs) {
+ G_main_setmaxdispatchdelay(gs,
1000);
+ G_main_setmaxdispatchtime(gs,
50);
+ }
}
ishealedpartition=1;
}
@@ -6042,6 +6064,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.481 2006/01/31 04:30:37 alan
+ * Put in code to detect and log whenever heartbeat functions take too long or
are delayed too long...
+ *
* Revision 1.480 2006/01/25 16:41:36 alan
* Put in a little clarification on a disagreeing membership message.
*
------------------------------
_______________________________________________
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 67
********************************************
