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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 13 Jan 2006 07:53:27 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_hb.c
Log Message:
fix the cpu occupy bug. when the message comes from heartbeat instead of
disconnection, the handler should read the message out, otherwise the poll will
loop endless
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_hb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mgmt_hb.c 8 Dec 2005 08:54:56 -0000 1.2
+++ mgmt_hb.c 13 Jan 2006 14:53:26 -0000 1.3
@@ -141,12 +141,15 @@
gboolean
on_hb_input(IPC_Channel * chan, gpointer data)
{
+ struct ha_msg* msg;
if (chan != NULL && chan->ch_status == IPC_DISCONNECT) {
fire_event(EVT_DISCONNECTED);
mgmt_log(LOG_ERR, "Lost connection to heartbeat service.");
hb = NULL;
return FALSE;
}
+ msg = hb->llc_ops->readmsg(hb, 0);
+ ha_msg_del(msg);
return TRUE;
}
void
------------------------------
Message: 2
Date: Fri, 13 Jan 2006 11:34: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/crmd
Modified Files:
fsa.c
Log Message:
Fix up buffonary
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- fsa.c 13 Jan 2006 10:31:14 -0000 1.130
+++ fsa.c 13 Jan 2006 18:34:25 -0000 1.131
@@ -97,8 +97,9 @@
void s_crmd_fsa_actions(fsa_data_t *fsa_data);
void log_fsa_input(fsa_data_t *stored_msg);
+void init_dotfile(void);
-static void
+void
init_dotfile(void)
{
do_dot_log(DOT_PREFIX"digraph \"g\" {");
------------------------------
Message: 3
Date: Fri, 13 Jan 2006 11:34: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/tengine
Modified Files:
utils.c
Log Message:
Fix up buffonary
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/utils.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- utils.c 13 Jan 2006 10:31:14 -0000 1.48
+++ utils.c 13 Jan 2006 18:34:25 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.48 2006/01/13 10:31:14 andrew Exp $ */
+/* $Id: utils.c,v 1.49 2006/01/13 18:34:25 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -340,7 +340,7 @@
crm_element_value(
action->xml, XML_LRM_ATTR_TASK),
crm_element_value(
- action->xml, XML_LRM_ATTR_TARGET),
+ action->xml, XML_LRM_ATTR_TARGET)
/* crm_element_value( */
/* action->xml,
XML_LRM_ATTR_TARGET_UUID) */
);
------------------------------
_______________________________________________
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 29
********************************************
