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: lib by alan from ([email protected])
3. Linux-HA CVS: debian by horms from
([email protected])
4. Linux-HA CVS: lib by alan from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 2 Feb 2006 19:13:17 -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 heartbeat-2.postinst
Log Message:
Debian Packaging
Make /usr/bin/cl_status setgid
See: http://bugs.debian.org/cgi-bin/351178
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- changelog 3 Feb 2006 01:33:54 -0000 1.53
+++ changelog 3 Feb 2006 02:13:17 -0000 1.54
@@ -25,8 +25,10 @@
http://lists.gnu.org/archive/html/help-gnutls/2004-08/msg00001.html
* Fix insonsistency between hb_stanby(1) man page, an the wiki
(closes: #339016)
+ * Make /usr/bin/cl_status setgid
+ (closes: #351178)
- -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 10:22:00 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 11:11:44 +0900
heartbeat-2 (2.0.2-5) unstable; urgency=low
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.postinst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- heartbeat-2.postinst 3 Oct 2005 05:56:16 -0000 1.3
+++ heartbeat-2.postinst 3 Feb 2006 02:13:17 -0000 1.4
@@ -34,8 +34,8 @@
done
- chmod 2555 /usr/bin/cl_status
chgrp haclient /usr/bin/cl_status
+ chmod 2555 /usr/bin/cl_status
for i in root nobody hacluster; do
chmod 700 /var/lib/heartbeat/cores/$i
------------------------------
Message: 2
Date: Thu, 2 Feb 2006 19:21:11 -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/clplumbing
Modified Files:
GSource.c
Log Message:
Changed some formats from signed to unsigned...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- GSource.c 2 Feb 2006 17:05:03 -0000 1.63
+++ GSource.c 3 Feb 2006 02:21:10 -0000 1.64
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.63 2006/02/02 17:05:03 alan Exp $ */
+/* $Id: GSource.c,v 1.64 2006/02/03 02:21:10 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -120,13 +120,13 @@
#define WARN_DELAY(ms, input) cl_log(LOG_WARNING
\
, "%s: Dispatch function for %s was delayed" \
- " %ld ms before being called (GSource: 0x%lx)" \
+ " %lu ms before being called (GSource: 0x%lx)" \
, __FUNCTION__, (input)->description, ms \
, POINTER_TO_ULONG(input))
#define WARN_TOOLONG(ms, input) cl_log(LOG_WARNING
\
, "%s: Dispatch function for %s took too long to execute" \
- ": %ld ms (GSource: 0x%lx)" \
+ ": %lu ms (GSource: 0x%lx)" \
, __FUNCTION__, (input)->description, ms \
, POINTER_TO_ULONG(input))
------------------------------
Message: 3
Date: Thu, 2 Feb 2006 19:23:33 -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 heartbeat-2.dirs
Log Message:
Debian Packaging
Make sure that /var/run/heartbeat/{ccm,crm} exist on install
else postinst, and thus the install will abort.
See: http://bugs.debian.org/351181
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- changelog 3 Feb 2006 02:13:17 -0000 1.54
+++ changelog 3 Feb 2006 02:23:32 -0000 1.55
@@ -27,8 +27,11 @@
(closes: #339016)
* Make /usr/bin/cl_status setgid
(closes: #351178)
+ * Make sure that /var/run/heartbeat/{ccm,crm} exist on install
+ else postinst, and thus the install will abort.
+ (closes: #351181)
- -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 11:11:44 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Fri, 3 Feb 2006 11:21:53 +0900
heartbeat-2 (2.0.2-5) unstable; urgency=low
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.dirs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- heartbeat-2.dirs 24 Sep 2005 06:31:17 -0000 1.4
+++ heartbeat-2.dirs 3 Feb 2006 02:23:32 -0000 1.5
@@ -28,3 +28,5 @@
var/lib/heartbeat/ckpt
var/lock/subsys
var/run/heartbeat
+var/run/heartbeat/ccm
+var/run/heartbeat/crm
------------------------------
Message: 4
Date: Thu, 2 Feb 2006 19:49:28 -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/clplumbing
Modified Files:
GSource.c
Log Message:
Initialized some variables a little better (non-zero)
fixed some formats, and added some code to dump more info on delayed starting
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- GSource.c 3 Feb 2006 02:21:10 -0000 1.64
+++ GSource.c 3 Feb 2006 02:49:28 -0000 1.65
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.64 2006/02/03 02:21:10 alan Exp $ */
+/* $Id: GSource.c,v 1.65 2006/02/03 02:49:28 alan Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -124,6 +124,11 @@
, __FUNCTION__, (input)->description, ms \
, POINTER_TO_ULONG(input))
+#define EXPLAINDELAY(started, detected) cl_log(LOG_INFO \
+ , "%s: started at %llu should have started at %llu" \
+ , __FUNCTION__, started, detected)
+
+
#define WARN_TOOLONG(ms, input) cl_log(LOG_WARNING
\
, "%s: Dispatch function for %s took too long to execute" \
": %lu ms (GSource: 0x%lx)" \
@@ -137,6 +142,7 @@
if ((i)->maxdispatchdelayms > 0 \
&& ms > (i)->maxdispatchdelayms) { \
WARN_DELAY(ms, (i)); \
+ EXPLAINDELAY(dispstart, (i)->detecttime); \
} \
}
@@ -1377,11 +1383,11 @@
append->maxdispatchms = DEFAULT_MAXDISPATCH;
append->maxdispatchdelayms = DEFAULT_MAXDELAY;
append->description = "(timeout)";
- append->detecttime = 0;
+ append->detecttime = time_longclock();
append->udata = NULL;
- append->nexttime = add_longclock(time_longclock()
- ,msto_longclock(interval));
+ append->nexttime = add_longclock(append->detecttime
+ , msto_longclock(interval));
append->interval = interval;
g_source_set_priority(source, priority);
@@ -1464,7 +1470,7 @@
/* Schedule our next dispatch */
append->nexttime = add_longclock(time_longclock()
- , msto_longclock(append->interval));
+ , msto_longclock(append->interval));
/* Then call the user function */
ret = func(user_data);
------------------------------
_______________________________________________
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 17
********************************************
