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: cts by panjiam from
([email protected])
2. Linux-HA CVS: cts by panjiam from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: include by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 25 Mar 2006 20:48:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CM_LinuxHAv2.py.in
Log Message:
initialize nvparis before use
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -3 -r1.140 -r1.141
--- CM_LinuxHAv2.py.in 18 Mar 2006 17:29:35 -0000 1.140
+++ CM_LinuxHAv2.py.in 26 Mar 2006 03:48:25 -0000 1.141
@@ -515,7 +515,8 @@
self.inc_no = -1
self.inc_max = -1
self.rparameters = {}
-
+ nvpairs = []
+
list = node.getElementsByTagName('instance_attributes')
if len(list) > 0:
attributes = list[0]
------------------------------
Message: 2
Date: Sat, 25 Mar 2006 20:52:10 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTSlab.py.in
Log Message:
removed option --resource-class
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- CTSlab.py.in 13 Mar 2006 09:46:16 -0000 1.55
+++ CTSlab.py.in 26 Mar 2006 03:52:10 -0000 1.56
@@ -485,7 +485,6 @@
+ " --fencing (1 | 0 | yes | no)" \
+ " --suppress_cib_writes (1 | 0 | yes | no)" \
+ " -lstests" \
- + " --resource-class (ocf | heartbeat)" \
+ " --seed" \
+ " [number-of-iterations]"
sys.exit(1)
@@ -523,7 +522,6 @@
SuppressCib = 1
DoBSC = 0
ListTests = 0
- ResourceClass = "ocf"
HaveSeed = 0
#
# The values of the rest of the parameters are now properly derived from
@@ -644,9 +642,6 @@
elif args[i] == "--syslog-facility" or args[i] == "--facility":
skipthis=1
LogFacility = args[i+1]
- elif args[i] == "--resource-class":
- skipthis=1
- ResourceClass = args[i+1]
elif args[i] == "--seed":
skipthis=1
Seed=args[i+1]
@@ -695,7 +690,6 @@
Environment["DoBSC"] = DoBSC
Environment["use_logd"] = 0
Environment["logfacility"] = LogFacility
- Environment["ResourceClass" ] = ResourceClass
if config.Parameters.has_key("use_logd"):
Environment["use_logd"] = 1
------------------------------
Message: 3
Date: Sun, 26 Mar 2006 09:00:48 -0700 (MST)
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:
native.c
Log Message:
Re-enable stickiness for failed resources
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- native.c 21 Mar 2006 17:56:36 -0000 1.116
+++ native.c 26 Mar 2006 16:00:48 -0000 1.117
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.116 2006/03/21 17:56:36 andrew Exp $ */
+/* $Id: native.c,v 1.117 2006/03/26 16:00:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -119,10 +119,11 @@
"not_managed_default", rsc, INFINITY, node, data_set);
return;
+#if 0
} else if(rsc->failed) {
crm_info("Skipping resource stickiness for failed resource %s",
rsc->id);
-
+#endif
} else if(rsc->stickiness > 0 || rsc->stickiness < 0) {
rsc2node_new("stickiness", rsc, rsc->stickiness, node,data_set);
crm_debug("Resource %s: preferring current location (%s/%s)",
------------------------------
Message: 4
Date: Sun, 26 Mar 2006 09:02:29 -0700 (MST)
From: [email protected]
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
Modified Files:
crm.h
Log Message:
Use the function's short name
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- crm.h 17 Mar 2006 17:59:32 -0000 1.88
+++ crm.h 26 Mar 2006 16:02:29 -0000 1.89
@@ -1,4 +1,4 @@
-/* $Id: crm.h,v 1.88 2006/03/17 17:59:32 andrew Exp $ */
+/* $Id: crm.h,v 1.89 2006/03/26 16:02:29 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -202,13 +202,13 @@
#define LOG_MSG LOG_DEBUG_3
-#define crm_crit(w...) do_crm_log(LOG_CRIT, __FILE__, __FUNCTION__, w)
-#define crm_err(w...) do_crm_log(LOG_ERR, __FILE__, __FUNCTION__, w)
-#define crm_warn(w...) do_crm_log(LOG_WARNING, __FILE__, __FUNCTION__, w)
-#define crm_notice(w...) do_crm_log(LOG_NOTICE, __FILE__, __FUNCTION__, w)
-#define crm_info(w...) do_crm_log(LOG_INFO, __FILE__, __FUNCTION__, w)
+#define crm_crit(w...) do_crm_log(LOG_CRIT, __FILE__,
__PRETTY_FUNCTION__, w)
+#define crm_err(w...) do_crm_log(LOG_ERR, __FILE__,
__PRETTY_FUNCTION__, w)
+#define crm_warn(w...) do_crm_log(LOG_WARNING, __FILE__,
__PRETTY_FUNCTION__, w)
+#define crm_notice(w...) do_crm_log(LOG_NOTICE, __FILE__,
__PRETTY_FUNCTION__, w)
+#define crm_info(w...) do_crm_log(LOG_INFO, __FILE__,
__PRETTY_FUNCTION__, w)
#define crm_log_maybe(level, fmt...) if(crm_log_level >= (level)) { \
- do_crm_log((level), __FILE__, __FUNCTION__, fmt);
\
+ do_crm_log((level), __FILE__, __PRETTY_FUNCTION__, fmt);
\
}
#define crm_debug(fmt...) crm_log_maybe(LOG_DEBUG, fmt)
@@ -246,7 +246,7 @@
#define crm_action_debug_4(x) crm_do_action(LOG_DEBUG_4, x)
#define crm_log_xml(level, text, xml) if(crm_log_level >= level) { \
- print_xml_formatted(level, __FUNCTION__, xml, text); \
+ print_xml_formatted(level, __PRETTY_FUNCTION__, xml, text); \
}
#define crm_log_xml_crit(xml, text) crm_log_xml(LOG_CRIT, text, xml)
#define crm_log_xml_err(xml, text) crm_log_xml(LOG_ERR, text, xml)
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 61
********************************************
