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 sunjd from ([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: mgmt by andrew from
([email protected])
4. Linux-HA CVS: lib by sunjd from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 16 May 2006 02:09:28 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/lrm
Modified Files:
raexeclsb.c
Log Message:
make the matching case insensitive for LSB comment keywords
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexeclsb.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- raexeclsb.c 26 Dec 2005 22:46:37 -0000 1.44
+++ raexeclsb.c 16 May 2006 08:09:27 -0000 1.45
@@ -57,7 +57,7 @@
* The reload and the try-restart options are optional. Other init script
* actions may be defined by the init script.
*/
-#define meta_data_template "\n"\
+#define meta_data_template \
"<?xml version=\"1.0\"?>\n"\
"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"\
"<resource-agent name=%s"\
@@ -109,7 +109,7 @@
}
#define RALSB_GET_VALUE(ptr, keyword) \
- if ( (ptr == NULL) & (0 == strncmp(buffer, keyword, strlen(keyword))) )
{ \
+ if ( (ptr == NULL) & (0 == strncasecmp(buffer, keyword,
strlen(keyword))) ) { \
(ptr) = g_strdup(buffer+strlen(keyword)); \
if (*(ptr+strlen(ptr)-1) == '\n') { \
*(ptr+strlen(ptr)-1) = ' '; \
@@ -348,13 +348,13 @@
break; /* donnot find */
}
- if (found_begin_tag == TRUE && 0 == strncmp(buffer
+ if (found_begin_tag == TRUE && 0 == strncasecmp(buffer
, LSB_INITSCRIPT_END_TAG
, strlen(LSB_INITSCRIPT_END_TAG)) ) {
is_lsb_script = TRUE;
break;
}
- if (found_begin_tag == FALSE && 0 == strncmp(buffer
+ if (found_begin_tag == FALSE && 0 == strncasecmp(buffer
, LSB_INITSCRIPT_BEGIN_TAG
, strlen(LSB_INITSCRIPT_BEGIN_TAG)) ) {
found_begin_tag = TRUE;
@@ -485,7 +485,7 @@
next_continue = FALSE;
}
- if ( 0 == strncmp(buffer , LSB_INITSCRIPT_BEGIN_TAG
+ if ( 0 == strncasecmp(buffer , LSB_INITSCRIPT_BEGIN_TAG
, strlen(LSB_INITSCRIPT_BEGIN_TAG)) ) {
break;
}
@@ -506,7 +506,7 @@
RALSB_GET_VALUE(s_dscrpt, SHORT_DSCR)
/* Long description may cross multiple lines */
- if ( (l_dscrpt == NULL) & (0 == strncmp(buffer, DESCRIPTION
+ if ( (l_dscrpt == NULL) & (0 == strncasecmp(buffer, DESCRIPTION
, strlen(DESCRIPTION))) ) {
l_dscrpt = g_string_new(buffer+strlen(DESCRIPTION));
/* Between # and keyword, more than one space, or a tab
@@ -527,7 +527,7 @@
continue;
}
- if ( 0 == strncmp(buffer, LSB_INITSCRIPT_END_TAG
+ if ( 0 == strncasecmp(buffer, LSB_INITSCRIPT_END_TAG
, strlen(LSB_INITSCRIPT_END_TAG)) ) {
/* Get to the out border of LSB comment block */
break;
------------------------------
Message: 2
Date: Tue, 16 May 2006 02:43:21 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
complex.c
Log Message:
OSDL #1253
Parent options do NOT take precedence of child values (reverts a recent change)
Use #default as a special parameter value
- '#' indicates its a CRM special option and should prevent name clashes
- when used, the PE pretends the option was never set
- have the GUI use #default to change the target_role back to whatever the
crm thinks it should be
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- complex.c 11 May 2006 07:32:12 -0000 1.86
+++ complex.c 16 May 2006 08:43:21 -0000 1.87
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.86 2006/05/11 07:32:12 andrew Exp $ */
+/* $Id: complex.c,v 1.87 2006/05/16 08:43:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -250,10 +250,6 @@
(*rsc)->fns = &resource_class_functions[(*rsc)->variant];
crm_debug_3("Unpacking resource...");
- if(defaults != NULL) {
- g_hash_table_foreach(defaults, dup_attr, (*rsc)->parameters);
- }
-
for(lpc = 0; lpc < DIMOF(rsc_attrs); lpc++) {
value = crm_element_value(xml_obj, rsc_attrs[lpc]);
if(value != NULL) {
@@ -266,6 +262,9 @@
xml_obj, XML_TAG_ATTR_SETS, NULL, (*rsc)->parameters,
allowed_attrs, DIMOF(allowed_attrs), data_set);
+ if(defaults != NULL) {
+ g_hash_table_foreach(defaults, dup_attr, (*rsc)->parameters);
+ }
(*rsc)->runnable = TRUE;
(*rsc)->provisional = TRUE;
@@ -632,6 +631,9 @@
crm_debug_3("adding: name=%s value=%s", crm_str(name), crm_str(value));
if(name == NULL || value == NULL) {
return;
+
+ } else if(safe_str_eq(value, "#default")) {
+ return;
} else if(g_hash_table_lookup(hash, name) == NULL) {
g_hash_table_insert(hash, crm_strdup(name), crm_strdup(value));
------------------------------
Message: 3
Date: Tue, 16 May 2006 02:43:22 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in
Log Message:
OSDL #1253
Parent options do NOT take precedence of child values (reverts a recent change)
Use #default as a special parameter value
- '#' indicates its a CRM special option and should prevent name clashes
- when used, the PE pretends the option was never set
- have the GUI use #default to change the target_role back to whatever the
crm thinks it should be
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- haclient.py.in 15 May 2006 00:19:26 -0000 1.39
+++ haclient.py.in 16 May 2006 08:43:21 -0000 1.40
@@ -1369,7 +1369,7 @@
elif action.get_name() == "stoprsc" :
target_role = "stopped"
else :
- target_role = "default"
+ target_role = "#default"
(attrs, running_on, params, ops) = \
manager.get_rsc_info(self.cur_name)
------------------------------
Message: 4
Date: Tue, 16 May 2006 03:01:51 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/stonith
Modified Files:
apcmastersnmp.c drac3.c ipmilan.c rcd_serial.c rps10.c
stonith_config_xml.h vacm.c
Log Message:
Add the 'require' field of parameters; add a few line feeds to metadata
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/apcmastersnmp.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- apcmastersnmp.c 9 Feb 2006 09:50:55 -0000 1.25
+++ apcmastersnmp.c 16 May 2006 09:01:51 -0000 1.26
@@ -1,4 +1,4 @@
-/* $Id: apcmastersnmp.c,v 1.25 2006/02/09 09:50:55 sunjd Exp $ */
+/* $Id: apcmastersnmp.c,v 1.26 2006/05/16 09:01:51 sunjd Exp $ */
/*
* Stonith module for APC Masterswitch (SNMP)
* Copyright (c) 2001 Andreas Piesk <[EMAIL PROTECTED]>
@@ -180,7 +180,7 @@
XML_PARM_LONGDESC_END
#define XML_PORT_PARM \
- XML_PARAMETER_BEGIN(ST_PORT, "string") \
+ XML_PARAMETER_BEGIN(ST_PORT, "string", "1") \
XML_PORT_SHORTDESC \
XML_PORT_LONGDESC \
XML_PARAMETER_END
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/drac3.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- drac3.c 20 Apr 2005 20:18:16 -0000 1.15
+++ drac3.c 16 May 2006 09:01:51 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Id: drac3.c,v 1.15 2005/04/20 20:18:16 blaschke Exp $ */
+/* $Id: drac3.c,v 1.16 2006/05/16 09:01:51 sunjd Exp $ */
/*
* Stonith module for Dell DRACIII (Dell Remote Access Card)
*
@@ -119,7 +119,7 @@
XML_PARM_LONGDESC_END
#define XML_HOST_PARM \
- XML_PARAMETER_BEGIN(ST_HOST, "string") \
+ XML_PARAMETER_BEGIN(ST_HOST, "string", "1") \
XML_HOST_SHORTDESC \
XML_HOST_LONGDESC \
XML_PARAMETER_END
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/ipmilan.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ipmilan.c 20 Apr 2005 20:18:16 -0000 1.16
+++ ipmilan.c 16 May 2006 09:01:51 -0000 1.17
@@ -1,4 +1,4 @@
-/* $Id: ipmilan.c,v 1.16 2005/04/20 20:18:16 blaschke Exp $ */
+/* $Id: ipmilan.c,v 1.17 2006/05/16 09:01:51 sunjd Exp $ */
/*
* Stonith module for ipmi lan Stonith device
*
@@ -134,7 +134,7 @@
XML_PARM_LONGDESC_END
#define XML_HOSTNAME_PARM \
- XML_PARAMETER_BEGIN(ST_HOSTNAME, "string") \
+ XML_PARAMETER_BEGIN(ST_HOSTNAME, "string", "1") \
XML_HOSTNAME_SHORTDESC \
XML_HOSTNAME_LONGDESC \
XML_PARAMETER_END
@@ -150,7 +150,7 @@
XML_PARM_LONGDESC_END
#define XML_PORT_PARM \
- XML_PARAMETER_BEGIN(ST_PORT, "string") \
+ XML_PARAMETER_BEGIN(ST_PORT, "string", "1") \
XML_PORT_SHORTDESC \
XML_PORT_LONGDESC \
XML_PARAMETER_END
@@ -166,7 +166,7 @@
XML_PARM_LONGDESC_END
#define XML_AUTH_PARM \
- XML_PARAMETER_BEGIN(ST_AUTH, "string") \
+ XML_PARAMETER_BEGIN(ST_AUTH, "string", "1") \
XML_AUTH_SHORTDESC \
XML_AUTH_LONGDESC \
XML_PARAMETER_END
@@ -182,7 +182,7 @@
XML_PARM_LONGDESC_END
#define XML_PRIV_PARM \
- XML_PARAMETER_BEGIN(ST_PRIV, "string") \
+ XML_PARAMETER_BEGIN(ST_PRIV, "string", "1") \
XML_PRIV_SHORTDESC \
XML_PRIV_LONGDESC \
XML_PARAMETER_END
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/rcd_serial.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- rcd_serial.c 22 Apr 2005 12:23:05 -0000 1.29
+++ rcd_serial.c 16 May 2006 09:01:51 -0000 1.30
@@ -1,4 +1,4 @@
-/* $Id: rcd_serial.c,v 1.29 2005/04/22 12:23:05 blaschke Exp $ */
+/* $Id: rcd_serial.c,v 1.30 2006/05/16 09:01:51 sunjd Exp $ */
/*
* Stonith module for RCD_SERIAL Stonith device
*
@@ -267,7 +267,7 @@
XML_PARM_LONGDESC_END
#define XML_DTRRTS_PARM \
- XML_PARAMETER_BEGIN(ST_DTRRTS, "string") \
+ XML_PARAMETER_BEGIN(ST_DTRRTS, "string", "1") \
XML_DTRRTS_SHORTDESC \
XML_DTRRTS_LONGDESC \
XML_PARAMETER_END
@@ -283,7 +283,7 @@
XML_PARM_LONGDESC_END
#define XML_MSDURATION_PARM \
- XML_PARAMETER_BEGIN(ST_MSDURATION, "string") \
+ XML_PARAMETER_BEGIN(ST_MSDURATION, "string", "1") \
XML_MSDURATION_SHORTDESC \
XML_MSDURATION_LONGDESC \
XML_PARAMETER_END
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/rps10.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- rps10.c 22 Apr 2005 12:23:05 -0000 1.24
+++ rps10.c 16 May 2006 09:01:51 -0000 1.25
@@ -1,4 +1,4 @@
-/* $Id: rps10.c,v 1.24 2005/04/22 12:23:05 blaschke Exp $ */
+/* $Id: rps10.c,v 1.25 2006/05/16 09:01:51 sunjd Exp $ */
/*
* Stonith module for WTI Remote Power Controllers (RPS-10M device)
*
@@ -195,7 +195,7 @@
XML_PARM_LONGDESC_END
#define XML_RPS10_PARM \
- XML_PARAMETER_BEGIN(ST_RPS10, "string") \
+ XML_PARAMETER_BEGIN(ST_RPS10, "string", "1") \
XML_RPS10_SHORTDESC \
XML_RPS10_LONGDESC \
XML_PARAMETER_END
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/stonith_config_xml.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- stonith_config_xml.h 19 Apr 2005 18:13:36 -0000 1.1
+++ stonith_config_xml.h 16 May 2006 09:01:51 -0000 1.2
@@ -35,20 +35,20 @@
#define XML_PARAMETERS_END "</parameters>"
/* <parameter name="ipaddr" unique="1">?<content type="string" /></parameter>
*/
-#define XML_PARAMETER_BEGIN(name,type) \
- "<parameter name=\"" name "\" unique=\"1\">" \
- "<content type=\"" type "\" />"
-#define XML_PARAMETER_END "</parameter>"
+#define XML_PARAMETER_BEGIN(name,type,req) \
+ "<parameter name=\"" name "\" unique=\"1\" required=\"" req "\">" \
+ "<content type=\"" type "\" />\n"
+#define XML_PARAMETER_END "</parameter>\n"
/* <shortdesc lang="en">?</shortdesc> */
#define XML_PARM_SHORTDESC_BEGIN(lang) \
- "<shortdesc lang=\"" lang "\">"
-#define XML_PARM_SHORTDESC_END "</shortdesc>"
+ "<shortdesc lang=\"" lang "\">\n"
+#define XML_PARM_SHORTDESC_END "</shortdesc>\n"
/* <longdesc lang="en">?</longdesc> */
#define XML_PARM_LONGDESC_BEGIN(lang) \
- "<longdesc lang=\"" lang "\">"
-#define XML_PARM_LONGDESC_END "</longdesc>"
+ "<longdesc lang=\"" lang "\">\n"
+#define XML_PARM_LONGDESC_END "</longdesc>\n"
/*
* The short and long descriptions for the few standardized parameter names;
@@ -120,37 +120,37 @@
* Complete parameter descriptions for the few standardized parameter names
*/
#define XML_HOSTLIST_PARM \
- XML_PARAMETER_BEGIN(ST_HOSTLIST, "string") \
+ XML_PARAMETER_BEGIN(ST_HOSTLIST, "string", "1") \
XML_HOSTLIST_SHORTDESC \
XML_HOSTLIST_LONGDESC \
XML_PARAMETER_END
#define XML_IPADDR_PARM \
- XML_PARAMETER_BEGIN(ST_IPADDR, "string") \
+ XML_PARAMETER_BEGIN(ST_IPADDR, "string", "1") \
XML_IPADDR_SHORTDESC \
XML_IPADDR_LONGDESC \
XML_PARAMETER_END
#define XML_LOGIN_PARM \
- XML_PARAMETER_BEGIN(ST_LOGIN, "string") \
+ XML_PARAMETER_BEGIN(ST_LOGIN, "string", "1") \
XML_LOGIN_SHORTDESC \
XML_LOGIN_LONGDESC \
XML_PARAMETER_END
#define XML_PASSWD_PARM \
- XML_PARAMETER_BEGIN(ST_PASSWD, "string") \
+ XML_PARAMETER_BEGIN(ST_PASSWD, "string", "1") \
XML_PASSWD_SHORTDESC \
XML_PASSWD_LONGDESC \
XML_PARAMETER_END
#define XML_COMMUNITY_PARM \
- XML_PARAMETER_BEGIN(ST_COMMUNITY, "string") \
+ XML_PARAMETER_BEGIN(ST_COMMUNITY, "string", "1") \
XML_COMMUNITY_SHORTDESC \
XML_COMMUNITY_LONGDESC \
XML_PARAMETER_END
#define XML_TTYDEV_PARM \
- XML_PARAMETER_BEGIN(ST_TTYDEV, "string") \
+ XML_PARAMETER_BEGIN(ST_TTYDEV, "string", "1") \
XML_TTYDEV_SHORTDESC \
XML_TTYDEV_LONGDESC \
XML_PARAMETER_END
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/vacm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- vacm.c 29 Jul 2005 08:15:48 -0000 1.15
+++ vacm.c 16 May 2006 09:01:51 -0000 1.16
@@ -1,5 +1,5 @@
-/* $Id: vacm.c,v 1.15 2005/07/29 08:15:48 sunjd Exp $ */
+/* $Id: vacm.c,v 1.16 2006/05/16 09:01:51 sunjd Exp $ */
/******************************************************************************
*
* Copyright 2000 Sistina Software, Inc.
@@ -139,7 +139,7 @@
XML_PARM_LONGDESC_END
#define XML_NEXXUS_PARM \
- XML_PARAMETER_BEGIN(ST_NEXXUS, "string") \
+ XML_PARAMETER_BEGIN(ST_NEXXUS, "string", "1") \
XML_NEXXUS_SHORTDESC \
XML_NEXXUS_LONGDESC \
XML_PARAMETER_END
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 47
********************************************
