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: include by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: cts by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: resources by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: linux-ha by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Aug 2006 03:06:32 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm/common
Modified Files:
util.h
Log Message:
Finish creating generic, self-documenting option processing code
Use the above to impliment the meta-data command for the pengine and crmd
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/util.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- util.h 6 Jul 2006 13:30:23 -0000 1.38
+++ util.h 14 Aug 2006 09:06:31 -0000 1.39
@@ -1,4 +1,4 @@
-/* $Id: util.h,v 1.38 2006/07/06 13:30:23 andrew Exp $ */
+/* $Id: util.h,v 1.39 2006/08/14 09:06:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -29,6 +29,11 @@
#define DEBUG_DEC SIGUSR2
extern unsigned int crm_log_level;
+extern gboolean crm_config_error;
+extern gboolean crm_config_warning;
+
+#define crm_config_err(fmt...) { crm_config_error = TRUE; crm_err(fmt); }
+#define crm_config_warn(fmt...) { crm_config_warning = TRUE; crm_warn(fmt); }
extern gboolean crm_log_init(const char *entity);
@@ -149,4 +154,35 @@
extern cl_mem_stats_t *crm_running_stats;
+typedef struct pe_cluster_option_s {
+ const char *name;
+ const char *alt_name;
+ const char *type;
+ const char *values;
+ const char *default_value;
+
+ gboolean (*is_valid)(const char *);
+
+ const char *description_short;
+ const char *description_long;
+
+} pe_cluster_option;
+
+extern const char *cluster_option(
+ GHashTable* options, gboolean(*validate)(const char*),
+ const char *name, const char *old_name, const char *def_value);
+
+extern const char *get_cluster_pref(
+ GHashTable *options, pe_cluster_option *option_list, int len, const
char *name);
+
+extern void config_metadata(
+ const char *name, const char *version, const char *desc_short, const
char *desc_long,
+ pe_cluster_option *option_list, int len);
+
+extern void verify_all_options(GHashTable *options, pe_cluster_option
*option_list, int len);
+extern gboolean check_time(const char *value);
+extern gboolean check_timer(const char *value);
+extern gboolean check_boolean(const char *value);
+extern gboolean check_number(const char *value);
+
#endif
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 03:09:14 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CIB.py.in
Removed Files:
OCFMSDummy.in
Log Message:
Remove the hideous OCFMSDummy agent that timed out frequently and didnt
really know what it was doing.
Replace it with something that works and can sanely be used as a template
by others
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- CIB.py.in 14 Aug 2006 09:06:31 -0000 1.20
+++ CIB.py.in 14 Aug 2006 09:09:14 -0000 1.21
@@ -97,16 +97,11 @@
<nvpair id="master_node_max_4" name="master_node_max"
value="%d"/>
</attributes>
</instance_attributes>
- <primitive id="ocf_msdummy" class="ocf"
type="@libdir@/heartbeat/cts/OCFMSDummy" provider="heartbeat">
+ <primitive id="ocf_msdummy" class="ocf" type="Stateful"
provider="heartbeat">
<operations>
<op id="ocf_msdummy_monitor" name="monitor" interval="5s"/>
<op id="ocf_msdummy_monitor_master" name="monitor" interval="6s"
role="Master"/>
</operations>
- <instance_attributes id="master-child">
- <attributes>
- <nvpair id="logfile_id_1" name="logfile"
value="/var/log/cts_ocfdummy.log"/>
- </attributes>
- </instance_attributes>
</primitive>
</master_slave>'''
------------------------------
Message: 3
Date: Mon, 14 Aug 2006 03:09:15 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Dummy.in Makefile.am
Log Message:
Remove the hideous OCFMSDummy agent that timed out frequently and didnt
really know what it was doing.
Replace it with something that works and can sanely be used as a template
by others
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Dummy.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Dummy.in 27 Jul 2006 09:19:36 -0000 1.5
+++ Dummy.in 14 Aug 2006 09:09:14 -0000 1.6
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Dummy.in,v 1.5 2006/07/27 09:19:36 andrew Exp $
+# $Id: Dummy.in,v 1.6 2006/08/14 09:09:14 andrew Exp $
#
# Dummy OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -73,6 +73,15 @@
<shortdesc lang="en">Monitor delay</shortdesc>
<content type="integer" default="2" />
</parameter>
+
+<parameter name="state" unique="1">
+<longdesc lang="en">
+Location to store the resource state in
+</longdesc>
+<shortdesc lang="en">State file</shortdesc>
+<content type="string"
default="@localstatedir@/run/@HB_PKG@/rsctmp/Dummy-{OCF_RESOURCE_INSTANCE}.state"
/>
+</parameter>
+
</parameters>
<actions>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am 13 Jul 2006 16:25:32 -0000 1.18
+++ Makefile.am 14 Aug 2006 09:09:14 -0000 1.19
@@ -62,6 +62,7 @@
pgsql \
Raid1 \
ServeRAID \
+ Stateful \
SysInfo \
VIPArip \
WAS \
------------------------------
Message: 4
Date: Mon, 14 Aug 2006 03:09:14 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Remove the hideous OCFMSDummy agent that timed out frequently and didnt
really know what it was doing.
Replace it with something that works and can sanely be used as a template
by others
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -3 -r1.544 -r1.545
--- configure.in 8 Aug 2006 12:41:54 -0000 1.544
+++ configure.in 14 Aug 2006 09:09:14 -0000 1.545
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.544 $) dnl cvs revision
+AC_REVISION($Revision: 1.545 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2782,6 +2782,7 @@
resources/OCF/Raid1 \
resources/OCF/pgsql \
resources/OCF/ServeRAID \
+ resources/OCF/Stateful \
resources/OCF/SysInfo \
resources/OCF/VIPArip \
resources/OCF/WAS \
------------------------------
_______________________________________________
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 33, Issue 21
********************************************
