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: membership by gshi from
([email protected])
2. Linux-HA CVS: lib by gshi from ([email protected])
3. Linux-HA CVS: lib by gshi from ([email protected])
4. Linux-HA CVS: heartbeat by gshi from
([email protected])
5. Linux-HA CVS: resources by xunsun from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 11 Nov 2005 12:49:36 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: membership by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : membership
Dir : linux-ha/membership/ccm
Modified Files:
ccm.c
Log Message:
remove an error message: it's not an error to receive a ping node's status
message
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/membership/ccm/ccm.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- ccm.c 10 Nov 2005 21:33:30 -0000 1.107
+++ ccm.c 11 Nov 2005 19:49:35 -0000 1.108
@@ -161,8 +161,6 @@
}
if (STRNCMP_CONST(nodetype, NORMALNODE) !=0 ){
- cl_log(LOG_ERR, "%s: wrong node type(%s) for
node %s",
- __FUNCTION__, nodetype, orig);
return TRUE;
}
------------------------------
Message: 2
Date: Fri, 11 Nov 2005 13:39:44 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
ipcsocket.c
Log Message:
make BEAM happy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/ipcsocket.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- ipcsocket.c 15 Oct 2005 02:47:17 -0000 1.162
+++ ipcsocket.c 11 Nov 2005 20:39:44 -0000 1.163
@@ -1,4 +1,4 @@
-/* $Id: ipcsocket.c,v 1.162 2005/10/15 02:47:17 gshi Exp $ */
+/* $Id: ipcsocket.c,v 1.163 2005/11/11 20:39:44 gshi Exp $ */
/*
* ipcsocket unix domain socket implementation of IPC abstraction.
*
@@ -1739,7 +1739,7 @@
close(s);
return NULL;
}
- flags = fcntl(s, F_GETFL, O_NONBLOCK);
+ flags = fcntl(s, F_GETFL);
if (flags == -1) {
cl_perror("socket_wait_conn_new: cannot read file descriptor flags");
close(s);
@@ -1857,7 +1857,7 @@
}
#endif
- flags = fcntl(sockfd, F_GETFL, O_NONBLOCK);
+ flags = fcntl(sockfd, F_GETFL);
if (flags == -1) {
cl_perror("socket_client_channel_new: cannot read file descriptor
flags");
g_free(conn_info); conn_info = NULL;
@@ -1915,7 +1915,7 @@
conn_info = g_new(struct SOCKET_CH_PRIVATE, 1);
- flags = fcntl(sockfd, F_GETFL, O_NONBLOCK);
+ flags = fcntl(sockfd, F_GETFL);
if (flags == -1) {
cl_perror("socket_server_channel_new: cannot read file descriptor
flags");
g_free(conn_info); conn_info = NULL;
------------------------------
Message: 3
Date: Fri, 11 Nov 2005 13:46:15 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
cl_msg_types.c
Log Message:
make BEAM happy
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/cl_msg_types.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- cl_msg_types.c 8 Nov 2005 06:27:38 -0000 1.31
+++ cl_msg_types.c 11 Nov 2005 20:46:15 -0000 1.32
@@ -1633,7 +1633,10 @@
return HA_FAIL;
}
- return cl_msg_replace(msg, index, (char*)msgfield, 0, FT_UNCOMPRESS);
+ /* BEAM think this is a memory leak, but actually it is handle nicely
+ * in cl_msg_replace: old value is freed and new value is saved
+ */
+ return cl_msg_replace(msg, index, (char*)msgfield, 0, FT_UNCOMPRESS);/*
memory leak */
}
struct fieldtypefuncs_s fieldtypefuncs[NUM_MSG_TYPES]=
------------------------------
Message: 4
Date: Fri, 11 Nov 2005 16:33:28 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
heartbeat.c
Log Message:
bug 929: Read / Write child processes should not have access to unneeded file
descriptors
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/heartbeat.c,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -3 -r1.471 -r1.472
--- heartbeat.c 10 Nov 2005 22:44:29 -0000 1.471
+++ heartbeat.c 11 Nov 2005 23:33:27 -0000 1.472
@@ -2,7 +2,7 @@
* TODO:
* 1) Man page update
*/
-/* $Id: heartbeat.c,v 1.471 2005/11/10 22:44:29 gshi Exp $ */
+/* $Id: heartbeat.c,v 1.472 2005/11/11 23:33:27 gshi Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -825,16 +825,7 @@
cl_log(LOG_DEBUG, "opening %s %s (%s)", smj->type
, smj->name, smj->description);
}
- if (smj->vf->open(smj) != HA_OK) {
- cl_log(LOG_ERR, "cannot open %s %s"
- , smj->type
- , smj->name);
- return HA_FAIL;
- }
- if (ANYDEBUG) {
- cl_log(LOG_DEBUG, "%s channel %s now open..."
- , smj->type, smj->name);
- }
+
}
PILSetDebugLevel(PluginLoadingSystem, NULL, NULL, debug_level);
@@ -870,8 +861,15 @@
for (j=0; j < nummedia; ++j) {
struct hb_media* mp = sysmedia[j];
-
+
ourproc = procinfo->nprocs;
+
+ if (mp->vf->open(mp) != HA_OK){
+ cl_log(LOG_ERR, "cannot open %s %s",
+ mp->type,
+ mp->name);
+ return HA_FAIL;
+ }
switch ((pid=fork())) {
case -1: cl_perror("Can't fork write proc.");
@@ -930,6 +928,14 @@
}
NewTrackedProc(pid, 0, PT_LOGVERBOSE, GINT_TO_POINTER(ourproc)
, &CoreProcessTrackOps);
+
+
+ if (mp->vf->close(mp) != HA_OK){
+ cl_log(LOG_ERR, "cannot open %s %s",
+ mp->type,
+ mp->name);
+ return HA_FAIL;
+ }
}
@@ -6012,6 +6018,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.472 2005/11/11 23:33:27 gshi
+ * bug 929: Read / Write child processes should not have access to unneeded
file descriptors
+ *
* Revision 1.471 2005/11/10 22:44:29 gshi
* remove one debug message
*
------------------------------
Message: 5
Date: Sat, 12 Nov 2005 07:28:17 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by xunsun from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : xunsun
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
ocf-shellfuncs.in
Log Message:
use either ocf_is_hexadecimal or ocf_is_hex, but not both
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ocf-shellfuncs.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ocf-shellfuncs.in 11 Nov 2005 16:15:02 -0000 1.20
+++ ocf-shellfuncs.in 12 Nov 2005 14:28:17 -0000 1.21
@@ -1,5 +1,5 @@
#
-# $Id: ocf-shellfuncs.in,v 1.20 2005/11/11 16:15:02 davidlee Exp $
+# $Id: ocf-shellfuncs.in,v 1.21 2005/11/12 14:28:17 xunsun Exp $
#
# Common helper functions for the OCF Resource Agents supplied by
# heartbeat.
@@ -50,7 +50,7 @@
[ -z "`echo $1 | tr -d '[0-9]'`" ]
}
-ocf_is_hexadecimal() {
+ocf_is_hex() {
# test: delete all hex digits: result should be zero-length
[ -z "`echo $1 | tr -d '[0-9a-fA-F]'`" ]
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 24, Issue 47
********************************************
