Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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: fencing by sunjd from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: linux-ha by davidlee from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: cts by davidlee from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: lib by davidlee from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 17 Jul 2006 01:42:42 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : fencing
Dir : linux-ha/fencing/stonithd
Modified Files:
stonithd.c
Log Message:
(bug1379) This doesnot always indicate a error scenario
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- stonithd.c 14 Jul 2006 09:22:05 -0000 1.99
+++ stonithd.c 17 Jul 2006 07:42:41 -0000 1.100
@@ -1,4 +1,4 @@
-/* $Id: stonithd.c,v 1.99 2006/07/14 09:22:05 sunjd Exp $ */
+/* $Id: stonithd.c,v 1.100 2006/07/17 07:42:41 sunjd Exp $ */
/* File: stonithd.c
* Description: STONITH daemon for node fencing
@@ -1665,7 +1665,7 @@
if (msg2ipcchan(reply, ch) != HA_OK) { /* How to deal the error*/
ZAPMSG(reply);
- stonithd_log(LOG_ERR, "can't send signon reply message to IPC");
+ stonithd_log(LOG_WARNING, "can't send signon reply message to
IPC");
return ST_FAIL;
}
@@ -3596,6 +3596,9 @@
/*
* $Log: stonithd.c,v $
+ * Revision 1.100 2006/07/17 07:42:41 sunjd
+ * (bug1379) This doesnot always indicate a error scenario
+ *
* Revision 1.99 2006/07/14 09:22:05 sunjd
* log level tweak
*
------------------------------
Message: 2
Date: Mon, 17 Jul 2006 05:24:02 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Catch 'declaration-after-statement' compile-time non-portabilities.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -3 -r1.536 -r1.537
--- configure.in 13 Jul 2006 16:25:32 -0000 1.536
+++ configure.in 17 Jul 2006 11:24:01 -0000 1.537
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.536 $) dnl cvs revision
+AC_REVISION($Revision: 1.537 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -1708,6 +1708,7 @@
WARNLIST="all missing-prototypes
missing-declarations
strict-prototypes
+ declaration-after-statement
pointer-arith
write-strings
cast-qual cast-align
------------------------------
Message: 3
Date: Mon, 17 Jul 2006 05:26:49 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
Makefile.am
Log Message:
cts/Makefile.am rev 1.13 was a fudge. Should use automake's proper python
support
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 22 Jun 2006 22:12:36 -0000 1.13
+++ Makefile.am 17 Jul 2006 11:26:48 -0000 1.14
@@ -21,7 +21,7 @@
harddir = $(libdir)/heartbeat/cts
-hard_SCRIPTS = \
+hard_PYTHON = \
CM_fs.py \
CM_hb.py \
CM_LinuxHAv2.py \
@@ -42,19 +42,3 @@
lsbdir = $(libdir)/heartbeat/cts
lsb_SCRIPTS = LSBDummy
-## Python scripts *.py can generate *.pyc and *.pyo alongside.
-## Should remove these on "uninstall".
-##
-## This code was copied, with adaptation, from the expansion in "Makefile.in"
-## of the corresponding code to uninstall "hard_SCRIPTS".
-uninstall-hook:
- @$(NORMAL_UNINSTALL)
- @list='$(hard_SCRIPTS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- fc="$${f}c"; \
- fo="$${f}o"; \
- echo " rm -f '$(DESTDIR)$(harddir)/$$fc'"; \
- rm -f "$(DESTDIR)$(harddir)/$$fc"; \
- echo " rm -f '$(DESTDIR)$(harddir)/$$fo'"; \
- rm -f "$(DESTDIR)$(harddir)/$$fo"; \
- done
------------------------------
Message: 4
Date: Mon, 17 Jul 2006 10:56:47 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
GSource.c
Log Message:
Clearer log messages: include exceeded threshold.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- GSource.c 23 Apr 2006 20:39:01 -0000 1.83
+++ GSource.c 17 Jul 2006 16:56:47 -0000 1.84
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.83 2006/04/23 20:39:01 alan Exp $ */
+/* $Id: GSource.c,v 1.84 2006/07/17 16:56:47 davidlee Exp $ */
/*
* Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
*
@@ -66,10 +66,10 @@
#define OUTPUT_EVENTS (G_IO_OUT)
#define DEF_EVENTS (INPUT_EVENTS|ERR_EVENTS)
-#define WARN_DELAY(ms, input) cl_log(LOG_WARNING
\
+#define WARN_DELAY(ms, mx, input) cl_log(LOG_WARNING
\
, "%s: Dispatch function for %s was delayed" \
- " %lu ms before being called (GSource: 0x%lx)" \
- , __FUNCTION__, (input)->description, ms \
+ " %lu ms (> %lu ms) before being called (GSource: 0x%lx)" \
+ , __FUNCTION__, (input)->description, ms, mx \
, POINTER_TO_ULONG(input))
#define EXPLAINDELAY(started, detected) cl_log(LOG_INFO
\
@@ -78,10 +78,10 @@
, (unsigned long long)detected)
-#define WARN_TOOLONG(ms, input) cl_log(LOG_WARNING
\
+#define WARN_TOOLONG(ms, mx, input) cl_log(LOG_WARNING
\
, "%s: Dispatch function for %s took too long to execute" \
- ": %lu ms (GSource: 0x%lx)" \
- , __FUNCTION__, (input)->description, ms \
+ ": %lu ms (> %lu ms) (GSource: 0x%lx)" \
+ , __FUNCTION__, (input)->description, ms, mx \
, POINTER_TO_ULONG(input))
#define CHECK_DISPATCH_DELAY(i) {
\
@@ -92,7 +92,7 @@
ms = longclockto_ms(sub_longclock(dispstart,dettime)); \
if ((i)->maxdispatchdelayms > 0 \
&& ms > (i)->maxdispatchdelayms) { \
- WARN_DELAY(ms, (i)); \
+ WARN_DELAY(ms, (i)->maxdispatchdelayms, (i)); \
EXPLAINDELAY(dispstart, dettime); \
} \
}
@@ -102,14 +102,14 @@
longclock_t dispend = time_longclock(); \
ms = longclockto_ms(sub_longclock(dispend, dispstart)); \
if ((i)->maxdispatchms > 0 && ms > (i)->maxdispatchms) { \
- WARN_TOOLONG(ms, (i)); \
+ WARN_TOOLONG(ms, (i)->maxdispatchms, (i)); \
} \
lc_store(((i)->detecttime), zero_longclock); \
}
-#define WARN_TOOMUCH(ms, input) cl_log(LOG_WARNING
\
- , "%s: working on %s took %ld ms" \
- , __FUNCTION__, (input)->description, ms);
+#define WARN_TOOMUCH(ms, mx, input) cl_log(LOG_WARNING
\
+ , "%s: working on %s took %ld ms (> %ld ms)" \
+ , __FUNCTION__, (input)->description, ms, mx);
#define SAVESTART {funstart = time_longclock();}
@@ -118,7 +118,7 @@
long ms; \
ms = longclockto_ms(sub_longclock(funend, funstart)); \
if (ms > OTHER_MAXDELAY){ \
- WARN_TOOMUCH(ms, input); \
+ WARN_TOOMUCH(ms, ((long) OTHER_MAXDELAY), input); \
} \
} \
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 48
********************************************
