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: include by gshi from
([email protected])
2. Linux-HA CVS: resources by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 20 Dec 2005 19:34:33 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include
Modified Files:
ha_msg.h hb_api.h hb_api_core.h
Log Message:
add random delay to a client status request message
the random delay happens in client process
The maxium delay for a 2-node cluster is .2 second
for a 100 nodes cluster, it is 10 second
A new api is added to get number of normal nodes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/ha_msg.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- ha_msg.h 3 Nov 2005 20:33:53 -0000 1.77
+++ ha_msg.h 21 Dec 2005 02:34:32 -0000 1.78
@@ -1,4 +1,4 @@
-/* $Id: ha_msg.h,v 1.77 2005/11/03 20:33:53 gshi Exp $ */
+/* $Id: ha_msg.h,v 1.78 2005/12/21 02:34:32 gshi Exp $ */
/*
* Intracluster message object (struct ha_msg)
*
@@ -150,7 +150,6 @@
#define F_ORIGUUID "srcuuid" /* Real Originator uuid*/
#define F_NODE "node" /* Node being described */
#define F_NODELIST "nodelist" /* Node list being described */
-#define F_NUMNODES "numnode" /* Number of nodes in cluster*/
#define F_TO "dest" /* Destination (optional) */
#define F_TOUUID "destuuid" /* Destination uuid(optional) */
#define F_STATUS "st" /* New status (type = status) */
@@ -183,6 +182,7 @@
#define F_KEEPALIVE "keepalive" /* Keep alive time interval in ms. */
#define F_LOGFACILITY "logfacility" /* Suggested cluster syslog facility */
#define F_NODETYPE "nodetype" /* Type of node */
+#define F_NUMNODES "numnodes" /* num of total nodes(excluding ping
nodes*/
#define F_RTYPE "rtype" /* Resource type */
#define F_ORDERSEQ "oseq" /* Order Sequence number */
#define F_DT "dt" /* Dead time field for heartbeat*/
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/hb_api.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- hb_api.h 21 Dec 2005 00:01:51 -0000 1.41
+++ hb_api.h 21 Dec 2005 02:34:32 -0000 1.42
@@ -1,4 +1,4 @@
-/* $Id: hb_api.h,v 1.41 2005/12/21 00:01:51 gshi Exp $ */
+/* $Id: hb_api.h,v 1.42 2005/12/21 02:34:32 gshi Exp $ */
/*
* Client-side Low-level clustering API for heartbeat.
*
@@ -162,6 +162,11 @@
*/
const char * (*node_type)(ll_cluster_t*, const char * nodename);
/*
+ * num_nodes: Return the number of nodes(excluding ping nodes)
+ */
+ int (*num_nodes)(ll_cluster_t*);
+
+/*
* init_ifwalk: Initialize walk through list of list of known interfaces
*/
int (*init_ifwalk)(ll_cluster_t*, const char * node);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/hb_api_core.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- hb_api_core.h 9 Sep 2005 17:21:18 -0000 1.14
+++ hb_api_core.h 21 Dec 2005 02:34:32 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Id: hb_api_core.h,v 1.14 2005/09/09 17:21:18 gshi Exp $ */
+/* $Id: hb_api_core.h,v 1.15 2005/12/21 02:34:32 gshi Exp $ */
/*
* hb_api_core_h: Internal definitions and functions for the heartbeat API
*
@@ -108,6 +108,7 @@
#define API_NODELIST_END "nodelist-end"
#define API_NODESTATUS "nodestatus"
#define API_NODETYPE "nodetype"
+#define API_NUMNODES "numnodes"
#define API_IFLIST "iflist"
# define F_IFNAME "ifname"
------------------------------
Message: 2
Date: Tue, 20 Dec 2005 22:36:53 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Delay.in Raid1.in apache.in drbd.in
Log Message:
modify some required field and default value based on lmb's comments
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Delay.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Delay.in 29 Aug 2005 02:04:18 -0000 1.7
+++ Delay.in 21 Dec 2005 05:36:52 -0000 1.8
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Delay.in,v 1.7 2005/08/29 02:04:18 sunjd Exp $
+# $Id: Delay.in,v 1.8 2005/12/21 05:36:52 zhenh Exp $
#
# Support: [EMAIL PROTECTED]
# License: GNU General Public License (GPL)
@@ -36,7 +36,7 @@
usage() {
cat <<-!
usage: $0 {start|stop|status|monitor|meta-data|validate-all}
- $Id: Delay.in,v 1.7 2005/08/29 02:04:18 sunjd Exp $
+ $Id: Delay.in,v 1.8 2005/12/21 05:36:52 zhenh Exp $
!
}
@@ -54,7 +54,7 @@
<parameters>
-<parameter name="startdelay" unique="0">
+<parameter name="startdelay" unique="0" required="1">
<longdesc lang="en">
How long in seconds to delay on start operation.
</longdesc>
@@ -62,7 +62,7 @@
<content type="integer" default="30" />
</parameter>
-<parameter name="stopdelay" unique="0">
+<parameter name="stopdelay" unique="0" required="1">
<longdesc lang="en">
How long in seconds to delay on stop operation.
Defaults to "startdelay" if unspecified.
@@ -71,7 +71,7 @@
<content type="integer" default="30" />
</parameter>
-<parameter name="mondelay" unique="0">
+<parameter name="mondelay" unique="0" required="1">
<longdesc lang="en">
How long in seconds to delay on monitor operation.
Defaults to "startdelay" if unspecified.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Raid1.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Raid1.in 20 Dec 2005 08:34:47 -0000 1.5
+++ Raid1.in 21 Dec 2005 05:36:52 -0000 1.6
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Raid1.in,v 1.5 2005/12/20 08:34:47 zhenh Exp $
+# $Id: Raid1.in,v 1.6 2005/12/21 05:36:52 zhenh Exp $
#
# License: GNU General Public License (GPL)
# Support: [EMAIL PROTECTED]
@@ -113,7 +113,7 @@
usage() {
cat <<-EOT;
usage: $0 {start|stop|status|monitor|validate-all|usage|meta-data}
- $Id: Raid1.in,v 1.5 2005/12/20 08:34:47 zhenh Exp $
+ $Id: Raid1.in,v 1.6 2005/12/21 05:36:52 zhenh Exp $
EOT
}
@@ -136,7 +136,7 @@
The name of RAID configuration file. e.g. /etc/raidtab.
</longdesc>
<shortdesc lang="en">RAID tab config file</shortdesc>
-<content type="string" default="" />
+<content type="string" default="/etc/raidtab" />
</parameter>
<parameter name="raiddev" unique="0" required="1">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/apache.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- apache.in 20 Dec 2005 08:34:48 -0000 1.12
+++ apache.in 21 Dec 2005 05:36:52 -0000 1.13
@@ -431,13 +431,13 @@
<shortdesc lang="en">starts/stops apache web servers.</shortdesc>
<parameters>
-<parameter name="configfile">
+<parameter name="configfile" required="1">
<longdesc lang="en">
The fullpath name of configure file.It's a string of path
name. Other parameters can contain in this file.
</longdesc>
<shortdesc lang="en">configure file path</shortdesc>
-<content type="string" default="/opt/IBMHTTPServer/conf/httpd.conf or
/etc/httpd/httpd.conf" />
+<content type="string" default="/etc/httpd/httpd.conf" />
</parameter>
<parameter name="httpd">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/drbd.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- drbd.in 20 Dec 2005 08:34:48 -0000 1.17
+++ drbd.in 21 Dec 2005 05:36:52 -0000 1.18
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $Id: drbd.in,v 1.17 2005/12/20 08:34:48 zhenh Exp $
+# $Id: drbd.in,v 1.18 2005/12/21 05:36:52 zhenh Exp $
#
# OCF Resource Agent compliant drbd resource script.
#
# WARNING: This is experimental code and still has a lot of open
# TODOs.
#
-# Copyright (c) 2004 - 2005 SUSE LINUX Products GmbH, Lars Marowsky-Brée
+# Copyright (c) 2004 - 2005 SUSE LINUX Products GmbH, Lars Marowsky-Br�
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify
@@ -81,7 +81,7 @@
</parameter>
-<parameter name="clone_max">
+<parameter name="clone_max" required="1">
<longdesc lang="en">
Number of clones of this drbd resource. Do not fiddle with the default.
</longdesc>
@@ -89,7 +89,7 @@
<content type="integer" default="2"/>
</parameter>
-<parameter name="clone_node_max">
+<parameter name="clone_node_max" required="1">
<longdesc lang="en">
Clones per node. Do not fiddle with the default.
</longdesc>
@@ -97,7 +97,7 @@
<content type="integer" default="1"/>
</parameter>
-<parameter name="master_max">
+<parameter name="master_max" required="1">
<longdesc lang="en">
Maximum number of active primaries. Do not fiddle with the default.
</longdesc>
@@ -105,7 +105,7 @@
<content type="integer" default="1"/>
</parameter>
-<parameter name="master_node_max">
+<parameter name="master_node_max" required="1">
<longdesc lang="en">
Maximum number of primaries per node. Do not fiddle with the default.
</longdesc>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 50
********************************************
