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: crm by andrew from
([email protected])
2. Linux-HA CVS: mgmt by alan from ([email protected])
3. Linux-HA CVS: lib by alan from ([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 11 Jan 2006 13:11:26 -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:
This should prevent a single channel with a potentially infinite stream of
commands from dominating access to the CIB.
A maximum of one message is read from a channel before control is given
back to Gmainloop.
The exception to this is a channel for a disconnected client. In this case
we process everything else it has before continuing. By definition a
disconnected client has a finite number of requests to process.
Multiple clients all creating large queues and exiting is still not a happy
scenario.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- callbacks.c 11 Jan 2006 19:50:34 -0000 1.89
+++ callbacks.c 11 Jan 2006 20:11:26 -0000 1.90
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.89 2006/01/11 19:50:34 andrew Exp $ */
+/* $Id: callbacks.c,v 1.90 2006/01/11 20:11:26 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -367,6 +367,10 @@
ha_msg_add(op_request, F_CIB_CLIENTID, cib_client->id);
send_ipc_message(channel, op_request);
+
+ if(channel->ch_status != IPC_DISC_PENDING) {
+ break;
+ }
}
did_disconnect = cib_process_disconnect(channel, cib_client);
if(did_disconnect) {
@@ -434,6 +438,10 @@
crm_debug_3("Cleaning up request");
crm_msg_del(op_request);
op_request = NULL;
+
+ if(channel->ch_status != IPC_DISC_PENDING) {
+ break;
+ }
}
crm_debug_2("Processed %d messages", lpc);
------------------------------
Message: 2
Date: Wed, 11 Jan 2006 16:53:36 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
Changed the CIB update message to a debug level message.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- mgmt_crm.c 28 Dec 2005 15:13:35 -0000 1.7
+++ mgmt_crm.c 11 Jan 2006 23:53:35 -0000 1.8
@@ -252,7 +252,9 @@
void
on_cib_diff(const char *event, HA_Message *msg)
{
- mgmt_log(LOG_INFO,"update cib finished");
+ if (debug_level) {
+ mgmt_log(LOG_DEBUG,"update cib finished");
+ }
fire_event(EVT_CIB_CHANGED);
}
------------------------------
Message: 3
Date: Wed, 11 Jan 2006 20:23:19 -0700 (MST)
From: [email protected]
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/plugins/stonith
Modified Files:
wti_nps.c
Log Message:
Put in bug fix from Nat Reed.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/wti_nps.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- wti_nps.c 3 Jul 2005 22:15:50 -0000 1.28
+++ wti_nps.c 12 Jan 2006 03:23:18 -0000 1.29
@@ -1,4 +1,4 @@
-/* $Id: wti_nps.c,v 1.28 2005/07/03 22:15:50 alan Exp $ */
+/* $Id: wti_nps.c,v 1.29 2006/01/12 03:23:18 alan Exp $ */
/*
*
* Copyright 2001 Mission Critical Linux, Inc.
@@ -428,7 +428,7 @@
break;
}
}
- if (strcasecmp(name, sockname) == 0) {
+ if (strncasecmp(name, sockname, 16) == 0) {
ret = sockno;
snprintf(buf, sizeof(buf), "%d ", sockno);
strncat(*outlets, buf, left);
------------------------------
Message: 4
Date: Thu, 12 Jan 2006 08:01:49 -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:
Increase logging - sorry but too much depends on what is in these updates
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/callbacks.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- callbacks.c 11 Jan 2006 20:11:26 -0000 1.90
+++ callbacks.c 12 Jan 2006 15:01:48 -0000 1.91
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.90 2006/01/11 20:11:26 andrew Exp $ */
+/* $Id: callbacks.c,v 1.91 2006/01/12 15:01:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -901,8 +901,9 @@
cib_post_notify(call_options, op, input, rc, the_cib);
cib_diff_notify(call_options, op, input, rc, local_diff);
- log_xml_diff(rc==cib_ok?LOG_DEBUG:LOG_INFO,
- local_diff, "cib:diff");
+/* log_xml_diff(rc==cib_ok?LOG_DEBUG:LOG_INFO, local_diff,
"cib:diff"); */
+ /* because too much depends on what is in here... */
+ log_xml_diff(LOG_INFO, local_diff, "cib:diff");
} else if(result_cib != NULL) {
crm_err("%s call modified the CIB", op);
@@ -1186,6 +1187,9 @@
hb_cluster->llc_ops->rcvmsg(hb_cluster, 0);
}
+ if(hb_cluster->llc_ops->msgready(hb_cluster)) {
+ crm_debug("Returning to mainloop");
+ }
crm_debug_4("%d HA messages dispatched", lpc);
if (channel && (channel->ch_status != IPC_CONNECT)) {
------------------------------
Message: 5
Date: Thu, 12 Jan 2006 08:02:53 -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:
main.c
Log Message:
Use the same priority as local processes to ensure we make progress locally
even if the DC is going nuts.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- main.c 11 Jan 2006 13:06:11 -0000 1.30
+++ main.c 12 Jan 2006 15:02:53 -0000 1.31
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.30 2006/01/11 13:06:11 andrew Exp $ */
+/* $Id: main.c,v 1.31 2006/01/12 15:02:53 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -296,7 +296,7 @@
crm_debug_3("Adding channel to mainloop");
G_main_add_IPC_Channel(
- G_PRIORITY_HIGH, hb_cluster->llc_ops->ipcchan(hb_cluster),
+ G_PRIORITY_DEFAULT, hb_cluster->llc_ops->ipcchan(hb_cluster),
FALSE, cib_ha_dispatch, hb_cluster /* userdata */,
cib_ha_connection_destroy);
------------------------------
_______________________________________________
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 22
********************************************
