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: lib by alan from ([email protected])
2. Linux-HA CVS: lib by alan from ([email protected])
3. Linux-HA CVS: resources by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 10 Jan 2006 08:36:27 -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/plugins/HBcomm
Modified Files:
serial.c
Log Message:
Added a URL in the FAQ to the tty timeout message.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/HBcomm/serial.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- serial.c 18 Nov 2005 23:02:15 -0000 1.45
+++ serial.c 10 Jan 2006 15:36:26 -0000 1.46
@@ -1,4 +1,4 @@
-/* $Id: serial.c,v 1.45 2005/11/18 23:02:15 alan Exp $ */
+/* $Id: serial.c,v 1.46 2006/01/10 15:36:26 alan Exp $ */
/*
* Linux-HA serial heartbeat code
*
@@ -632,10 +632,13 @@
lastwarn = now;
warnyet = TRUE;
PILCallLog(LOG, PIL_WARN
- , "TTY write timeout on
[%s]"
- " (no connection or bad cable"
- "? [see documentation])"
- , mp->name);
+ , "TTY write timeout on [%s]"
+ " (no connection or bad cable"
+ "? [see documentation])"
+ , mp->name);
+ PILCallLog(LOG, PIL_INFO
+ , "See %s for details"
+ , HAURL("FAQ#TTYtimeout"));
}
}else{
PILCallLog(LOG, PIL_CRIT, "TTY write failure on
[%s]: %s"
@@ -704,6 +707,9 @@
}
/*
* $Log: serial.c,v $
+ * Revision 1.46 2006/01/10 15:36:26 alan
+ * Added a URL in the FAQ to the tty timeout message.
+ *
* Revision 1.45 2005/11/18 23:02:15 alan
* Fixed two BEAM bugs:
* Check for baud rates < 300 instead of <=0
------------------------------
Message: 2
Date: Tue, 10 Jan 2006 09:41:34 -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:
ipcsocket.c
Log Message:
Added a little code to finish pending I/O (if possible) before disconnecting.
This will give any stuck outbound messages one last push, and read in
any pending messages that might be waiting to be read.
This latter case is more useful for the case of someone calling the disconnect
function directly - rather than implicitly by destroying the channel.
But, it shouldn't hurt that case either, since we potentially have to destroy
pending
inbound messages anyway.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/ipcsocket.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- ipcsocket.c 10 Jan 2006 13:29:20 -0000 1.166
+++ ipcsocket.c 10 Jan 2006 16:41:33 -0000 1.167
@@ -1,4 +1,4 @@
-/* $Id: ipcsocket.c,v 1.166 2006/01/10 13:29:20 andrew Exp $ */
+/* $Id: ipcsocket.c,v 1.167 2006/01/10 16:41:33 alan Exp $ */
/*
* ipcsocket unix domain socket implementation of IPC abstraction.
*
@@ -655,6 +655,9 @@
cl_log(LOG_INFO, "forced disconnect for fd %d", conn_info->s);
}
#endif
+ if (ch->ch_status == IPC_CONNECT) {
+ socket_resume_io(ch);
+ }
close(conn_info->s);
cl_poll_ignore(conn_info->s);
conn_info->s = -1;
------------------------------
Message: 3
Date: Tue, 10 Jan 2006 10:32:35 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Filesystem.in
Log Message:
Changed Fileystem to not log status if it's called as a monitor operation.
Also noted a bug about validate-all.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Filesystem.in 20 Dec 2005 08:34:47 -0000 1.11
+++ Filesystem.in 10 Jan 2006 17:32:35 -0000 1.12
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Filesystem.in,v 1.11 2005/12/20 08:34:47 zhenh Exp $
+# $Id: Filesystem.in,v 1.12 2006/01/10 17:32:35 alan Exp $
#
# Support: [EMAIL PROTECTED]
# License: GNU General Public License (GPL)
@@ -96,7 +96,7 @@
cat <<-EOT;
usage: $0 {start|stop|status|monitor|validate-all|meta-data}
- $Id: Filesystem.in,v 1.11 2005/12/20 08:34:47 zhenh Exp $
+ $Id: Filesystem.in,v 1.12 2006/01/10 17:32:35 alan Exp $
EOT
}
@@ -323,26 +323,35 @@
#
Filesystem_status()
{
- if [ $blockdevice = "yes" ]; then
- grep -q -e "^$DEVICE $MOUNTPOINT " /proc/mounts
- rc=$?
+ if
+ [ $blockdevice = "yes" ]
+ then
+ greppat="^$DEVICE $MOUNTPOINT "
else
- grep -q -e " $MOUNTPOINT " /proc/mounts
- rc=$?
+ greppat=" $MOUNTPOINT "
+ rc=$?
fi
+ if
+ grep -q -e "${greppat}" /proc/mounts >/dev/null 2>&1
+ then
+ rc=$OCF_SUCCESS
+ msg="$MOUNTPOINT is mounted (running)"
+ else
+ rc=$OCF_NOT_RUNNING
+ msg="$MOUNTPOINT is unmounted (stopped)"
+ fi
- if [ $rc = 0 ] ; then
- ocf_log info "$MOUNTPOINT is mounted (running)"
- return $OCF_SUCCESS
- else
- ocf_log info "$MOUNTPOINT is unmounted (stopped)"
- return $OCF_NOT_RUNNING
- fi
+ case "$OP" in
+ status) ocf_log info "$msg";;
+ esac
+ return $rc
}
# end of Filesystem_status
#
# VALIDATE_ALL: Are the instance parameters valid?
+# FIXME!! The only part that's useful is the return code.
+# This code always returns $OCF_SUCCESS (!)
#
Filesystem_validate_all()
{
------------------------------
_______________________________________________
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 15
********************************************
