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: debian by horms from
([email protected])
2. Linux-HA CVS: lrm by alan from ([email protected])
3. Linux-HA CVS: debian by horms from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 9 Feb 2006 20:18:55 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
Tag: STABLE_1_2
changelog control
Log Message:
Debian Packaging
* Add pre-depends on adduser
http://bugs.debian.org/352027
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.17.2.34
retrieving revision 1.17.2.35
diff -u -3 -r1.17.2.34 -r1.17.2.35
--- changelog 3 Feb 2006 07:27:09 -0000 1.17.2.34
+++ changelog 10 Feb 2006 03:18:54 -0000 1.17.2.35
@@ -4,8 +4,10 @@
(closes: #351180)
* Fix inconsistency between hb_standb(1) man page and wiki
(closes: #351202)
+ * Add pre-depends on adduser
+ (closes: #352027)
- -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 16:26:00 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Fri, 10 Feb 2006 12:18:01 +0900
heartbeat (1.2.4-2) unstable; urgency=low
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.17.2.24
retrieving revision 1.17.2.25
diff -u -3 -r1.17.2.24 -r1.17.2.25
--- control 27 Dec 2005 04:55:22 -0000 1.17.2.24
+++ control 10 Feb 2006 03:18:54 -0000 1.17.2.25
@@ -84,6 +84,7 @@
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}, python, iproute, adduser, netkit-ping |
iputils-ping
+Pre-Depends: adduser
Recommends: sysklogd | syslog-ng | system-log-daemon, logrotate
Description: Subsystem for High-Availability Linux
heartbeat is a basic heartbeat subsystem for Linux-HA.
------------------------------
Message: 2
Date: Thu, 9 Feb 2006 20:20:01 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Put in checks for unallocated (freed) operation structures.
Also print out more information in the cases where I/O fails
or file descriptors are invalid.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -3 -r1.210 -r1.211
--- lrmd.c 9 Feb 2006 23:24:13 -0000 1.210
+++ lrmd.c 10 Feb 2006 03:20:01 -0000 1.211
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.210 2006/02/09 23:24:13 alan Exp $ */
+/* $Id: lrmd.c,v 1.211 2006/02/10 03:20:01 alan Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -1607,7 +1607,8 @@
}
else if (op->client_id == pid) {
op_node = g_list_next(op_node);
- rsc->repeat_op_list =
g_list_remove(rsc->repeat_op_list, op);
+ rsc->repeat_op_list = g_list_remove(rsc->repeat_op_list
+ , op);
lrmd_op_destroy(op);
}
else {
@@ -3344,6 +3345,7 @@
op->ra_stdout_fd = -1;
}
}
+
static void
destroy_pipe_ra_stderr(gpointer user_data)
{
@@ -3354,6 +3356,7 @@
op->ra_stderr_fd = -1;
}
}
+
static gboolean
handle_pipe_ra_stdout(int fd, gpointer user_data)
{
@@ -3366,6 +3369,12 @@
lrmd_log(LOG_ERR, "%s:%d: op==NULL.", __FUNCTION__, __LINE__);
return FALSE;
}
+ if (!cl_is_allocated(op)) {
+ lrmd_log(LOG_CRIT, "%s:%d: Unallocated op 0x%lx!!"
+ , __FUNCTION__, __LINE__
+ , (unsigned long)op);
+ return FALSE;
+ }
if (fd == -1) {
fd = op->ra_stdout_fd;
@@ -3375,6 +3384,7 @@
lrmd_log(LOG_CRIT
, "%s:%d: Attempt to read from closed file descriptor."
, __FUNCTION__, __LINE__);
+ lrmd_op_dump(op, "op w/closed fd");
return FALSE;
}
@@ -3405,9 +3415,9 @@
* This code isn't correct - there is no idea of a "line"
* in the code as it's presently written...
* It produces erratic and hard-to read messages in the logs.
- * And possibly causes errors in interpreting 'heartbeat' style
- * resource agents. FIXME
- * And, it's not obvious how the meta-data (which is _many_
+ * Under the right circumstances, it will cause errors in
+ * interpreting 'heartbeat' style resource agents. FIXME
+ * It's not obvious how the meta-data (which is _many_
* lines long) is handled by this...
* I suspect multi-line metadata hasn't been tested :-(.
*/
@@ -3429,6 +3439,13 @@
const char* op_type = NULL;
char * data = NULL;
+ if (!cl_is_allocated(op)) {
+ lrmd_log(LOG_CRIT, "%s:%d: Unallocated op 0x%lx!!"
+ , __FUNCTION__, __LINE__
+ , (unsigned long)op);
+ return FALSE;
+ }
+
if (0 != read_pipe(fd, &data, op)) {
if ( NULL != op->ra_stderr_gsource) {
G_main_del_fd(op->ra_stderr_gsource);
@@ -3465,6 +3482,12 @@
lrmd_debug3(LOG_DEBUG, "%s begin.", __FUNCTION__);
+ if (!cl_is_allocated(op)) {
+ lrmd_log(LOG_CRIT, "%s:%d: Unallocated op 0x%lx!!"
+ , __FUNCTION__, __LINE__
+ , (unsigned long)op);
+ return FALSE;
+ }
*data = NULL;
gstr_tmp = g_string_new("");
@@ -3490,16 +3513,18 @@
rc = -1;
switch (errno) {
default:
- cl_perror("%s::%d fd %d errno=%d, read"
+ cl_perror("%s:%d read error: fd %d errno=%d"
, __FUNCTION__, __LINE__
, fd, errno);
+ lrmd_op_dump(op, "op w/bad errno");
break;
- case EBADFD:
+ case EBADF:
lrmd_log(LOG_CRIT
, "%s:%d"
" Attempt to read from closed file descriptor %d."
, __FUNCTION__, __LINE__, fd);
+ lrmd_op_dump(op, "op w/closed fd");
break;
case EAGAIN:
@@ -3620,6 +3645,11 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.211 2006/02/10 03:20:01 alan
+ * Put in checks for unallocated (freed) operation structures.
+ * Also print out more information in the cases where I/O fails
+ * or file descriptors are invalid.
+ *
* Revision 1.210 2006/02/09 23:24:13 alan
* Put in some more error messages and more comments better explaining the bugs
* in the code.
------------------------------
Message: 3
Date: Thu, 9 Feb 2006 20:45:58 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
changelog control
Log Message:
Debian Packaging
* Add pre-depends on adduser
http://bugs.debian.org/352158
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- changelog 3 Feb 2006 07:29:07 -0000 1.56
+++ changelog 10 Feb 2006 03:45:52 -0000 1.57
@@ -32,8 +32,10 @@
(closes: #351181)
* Fix inconsistency between hb_standb(1) man page and wiki
(closes: #339016)
+ * Add Pre-Depends on adduser
+ (closes: #352158)
- -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 16:27:11 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Fri, 10 Feb 2006 12:19:56 +0900
heartbeat-2 (2.0.2-5) unstable; urgency=low
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- control 3 Feb 2006 01:15:16 -0000 1.39
+++ control 10 Feb 2006 03:45:52 -0000 1.40
@@ -25,6 +25,7 @@
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}, python, iproute, adduser, netkit-ping |
iputils-ping
+Pre-Depends: adduser
Recommends: sysklogd | syslog-ng | system-log-daemon, logrotate
Provides: heartbeat, libpils0, libstonith0, stonith
Conflicts: heartbeat, libpils0, libstonith0, stonith
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 42
********************************************
