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: mgmt by zhenh from
([email protected])
3. Linux-HA CVS: heartbeat by alan from
([email protected])
4. Linux-HA CVS: membership by alan from
([email protected])
5. Linux-HA CVS: membership by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 24 Jan 2006 19:30:26 -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:
add more memory check and use macro IPC_ISRCONN
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_hb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- mgmt_hb.c 13 Jan 2006 14:53:26 -0000 1.3
+++ mgmt_hb.c 25 Jan 2006 02:30:25 -0000 1.4
@@ -142,14 +142,19 @@
on_hb_input(IPC_Channel * chan, gpointer data)
{
struct ha_msg* msg;
- if (chan != NULL && chan->ch_status == IPC_DISCONNECT) {
+ if (chan == NULL) {
+ return FALSE;
+ }
+ if (!IPC_ISRCONN(chan)) {
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);
+ if (msg != NULL) {
+ ha_msg_del(msg);
+ }
return TRUE;
}
void
------------------------------
Message: 2
Date: Wed, 25 Jan 2006 02:27:52 -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:
mgmtd.c
Log Message:
fix a bug: the main group of a user is in /etc/passwd instead of /etc/group
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmtd.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- mgmtd.c 24 Jan 2006 15:32:56 -0000 1.14
+++ mgmtd.c 25 Jan 2006 09:27:51 -0000 1.15
@@ -22,6 +22,7 @@
#include <portability.h>
#include <sys/types.h>
+#include <pwd.h>
#include <grp.h>
#include <unistd.h>
#include <stdarg.h>
@@ -652,11 +653,20 @@
{
int index = 0;
char* grp_usr = NULL;
- struct group* gren = getgrnam(grp);
+ struct group *gren = NULL;
+ struct passwd *pwd = NULL;
+
if (test_mode) {
return 1;
}
+ pwd = getpwnam (usr);
+ gren = getgrgid(pwd->pw_gid);
+ if (strncmp(grp, gren->gr_name,MAX_STRLEN) == 0) {
+ return 1;
+ }
+
+ gren = getgrnam(grp);
if (gren == NULL) {
return 0;
}
------------------------------
Message: 3
Date: Wed, 25 Jan 2006 09:41:37 -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:
heartbeat.c
Log Message:
Put in a little clarification on a disagreeing membership message.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -3 -r1.479 -r1.480
--- heartbeat.c 15 Jan 2006 16:20:54 -0000 1.479
+++ heartbeat.c 25 Jan 2006 16:41:36 -0000 1.480
@@ -2,7 +2,7 @@
* TODO:
* 1) Man page update
*/
-/* $Id: heartbeat.c,v 1.479 2006/01/15 16:20:54 xunsun Exp $ */
+/* $Id: heartbeat.c,v 1.480 2006/01/25 16:41:36 alan Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -2587,12 +2587,17 @@
break;
}
}
- if ( j == num){
- /*this node is not found in incoming nodelist
- * we need to delete it
- */
- cl_log(LOG_ERR, "%s: Node %s is deleted and we don't
know it!",
- __FUNCTION__, config->nodes[i].nodename);
+ if (j == num){
+ /* This node is not found in incoming nodelist,
+ * therefore, we need to delete it.
+ *
+ * Of course, this assumes everyone has correct node
lists
+ * lists - which may not be the case :-( FIXME???
+ * And it assumes autojoin is on - which it may not
be...
+ */
+ cl_log(LOG_ERR, "%s: Node %s is deleted (according to
%s) and we don't know it!"
+ , __FUNCTION__, config->nodes[i].nodename
+ , fromnode->nodename);
hb_del_one_node(config->nodes[i].nodename);
}
@@ -6037,6 +6042,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.480 2006/01/25 16:41:36 alan
+ * Put in a little clarification on a disagreeing membership message.
+ *
* Revision 1.479 2006/01/15 16:20:54 xunsun
* popular "the the" typo
*
------------------------------
Message: 4
Date: Wed, 25 Jan 2006 09:57:47 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccm.c
Log Message:
Made a log message for an error condition be LOG_ERR and also made it a little
more informative.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccm.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- ccm.c 11 Nov 2005 19:49:35 -0000 1.108
+++ ccm.c 25 Jan 2006 16:57:46 -0000 1.109
@@ -223,11 +223,13 @@
numnodes_val = atoi(numnodes);
if (numnodes_val != info->llm.nodecount){
if (ANYDEBUG){
- cl_log(LOG_WARNING, " node count does not
agree: "
- "local count=%d,"
- "count in message =%d",
- info->llm.nodecount, numnodes_val);
+ cl_log(LOG_ERR, "Node count from node %s does
not agree"
+ ": local count=%d, count in message=%d"
+ , orig, info->llm.nodecount,
numnodes_val);
cl_log_message(LOG_DEBUG, msg);
+ /* We need to do something better to recover
from this
+ * FIXME!!
+ */
}
jump_to_joining_state(hb, info, msg);
}
------------------------------
Message: 5
Date: Wed, 25 Jan 2006 10:06:41 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccm.c
Log Message:
Put the test for debug being turned on out of the main message production
for the node count disagreement message.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccm.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- ccm.c 25 Jan 2006 16:57:46 -0000 1.109
+++ ccm.c 25 Jan 2006 17:06:41 -0000 1.110
@@ -222,15 +222,15 @@
if(numnodes != NULL){
numnodes_val = atoi(numnodes);
if (numnodes_val != info->llm.nodecount){
- if (ANYDEBUG){
- cl_log(LOG_ERR, "Node count from node %s does
not agree"
- ": local count=%d, count in message=%d"
- , orig, info->llm.nodecount,
numnodes_val);
+ cl_log(LOG_ERR, "Node count from node %s does not agree"
+ ": local count=%d, count in message=%d"
+ , orig, info->llm.nodecount, numnodes_val);
+ if (ANYDEBUG) {
cl_log_message(LOG_DEBUG, msg);
- /* We need to do something better to recover
from this
- * FIXME!!
- */
}
+ /* We need to do something better to recover from this
+ * FIXME!! (as of now it crashes (!))
+ */
jump_to_joining_state(hb, info, msg);
}
}
------------------------------
_______________________________________________
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 55
********************************************
