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 andrew from
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 21 Apr 2006 01:10:10 -0600 (MDT)
From: [email protected]
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:
CTS.py.in
Log Message:
Cachefile deletion code *DISABLED BY DEFAULT*
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTS.py.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- CTS.py.in 20 Apr 2006 10:56:32 -0000 1.59
+++ CTS.py.in 21 Apr 2006 07:10:09 -0000 1.60
@@ -421,6 +421,7 @@
def __init__(self, Environment, randseed=None):
self.Env = Environment
self.__InitialConditions()
+ self.clear_cache = 0
self.data = {
"up" : "up", # Status meaning up
"down" : "down", # Status meaning down
@@ -523,20 +524,21 @@
self.install_config(node)
-# Clear out the host cache to prevent the PE from shooting nodes
-# during StartOnebyOne
-# self.rsh.remote_python_call(
-# node, "os", "system", "rm -f @HA_VARLIBDIR@/heartbeat/hostcache")
-
if not self.ns.WaitForNodeToComeUp(node):
self.log("Second WaitForNodeToComeUp %s failed" % node)
return 0
- self.ShouldBeStatus[node] = "any"
+ self.ShouldBeStatus[node] = "any"
if self.StataCM(node) and self.cluster_stable(self["DeadTime"]):
self.log ("%s was already started" %(node))
return 1
+ # Clear out the host cache so autojoin can be exercised
+ if self.clear_cache:
+ self.debug("Removing cache file on: "+node)
+ self.rsh.remote_py(node, "os", "system",
+ "rm -f @HA_VARLIBDIR@/heartbeat/hostcache")
+
if self.rsh(node, self["StartCmd"]) != 0:
self.log ("Warn: Start command failed on node %s" %(node))
return None
@@ -569,6 +571,12 @@
self.log("node %s not booted, StartaCMnoBlock failed." % node)
return 0
+ # Clear out the host cache so autojoin can be exercised
+ if self.clear_cache:
+ self.debug("Removing cache file on: "+node)
+ self.rsh.remote_py(node, "os", "system",
+ "rm -f @HA_VARLIBDIR@/heartbeat/hostcache")
+
self.rsh.noBlock(node, self["StartCmd"])
self.ShouldBeStatus[node]=self["up"]
return 1
------------------------------
Message: 2
Date: Fri, 21 Apr 2006 01:11:42 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
cl_msg.c
Log Message:
Give some indication of what we were looking for at the time
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/cl_msg.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- cl_msg.c 6 Feb 2006 16:42:14 -0000 1.102
+++ cl_msg.c 21 Apr 2006 07:11:42 -0000 1.103
@@ -1,4 +1,4 @@
-/* $Id: cl_msg.c,v 1.102 2006/02/06 16:42:14 alan Exp $ */
+/* $Id: cl_msg.c,v 1.103 2006/04/21 07:11:42 andrew Exp $ */
/*
* Heartbeat messaging object.
*
@@ -1016,8 +1016,8 @@
int j;
if (!msg || !msg->names || !msg->values) {
- cl_log(LOG_ERR, "%s: wrong arugment",
- __FUNCTION__);
+ cl_log(LOG_ERR, "%s: wrong arugment (%s)",
+ __FUNCTION__, name);
return(NULL);
}
@@ -2456,6 +2456,9 @@
#endif
/*
* $Log: cl_msg.c,v $
+ * Revision 1.103 2006/04/21 07:11:42 andrew
+ * Give some indication of what we were looking for at the time
+ *
* Revision 1.102 2006/02/06 16:42:14 alan
* Put in a warning about selecting traditional_compression...
*
------------------------------
Message: 3
Date: Fri, 21 Apr 2006 01:33:16 -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:
Allow is_managed and resource_stickiness to be "set" to the cluster's global
value.
Update the DTD
- allow "default" as a value for is_managed
- Dont restrict resource_stickiness to and +/-INFINITY, it can be any integer
or "default"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/complex.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- complex.c 10 Apr 2006 07:23:27 -0000 1.80
+++ complex.c 21 Apr 2006 07:33:15 -0000 1.81
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.80 2006/04/10 07:23:27 andrew Exp $ */
+/* $Id: complex.c,v 1.81 2006/04/21 07:33:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -281,7 +281,9 @@
value = g_hash_table_lookup((*rsc)->parameters, "is_managed");
if(value != NULL) {
- cl_str_to_boolean(value, &((*rsc)->is_managed));
+ if(safe_str_neq("default", value)) {
+ cl_str_to_boolean(value, &((*rsc)->is_managed));
+ }
}
if((*rsc)->is_managed == FALSE) {
crm_warn("Resource %s is currently not managed", (*rsc)->id);
@@ -324,7 +326,9 @@
value = g_hash_table_lookup((*rsc)->parameters, "resource_stickiness");
if(value != NULL) {
- (*rsc)->stickiness = char2score(value);
+ if(safe_str_neq("default", value)) {
+ (*rsc)->stickiness = char2score(value);
+ }
}
if((*rsc)->stickiness > 0) {
crm_debug_2("\tPlacement: prefer current location%s",
------------------------------
Message: 4
Date: Fri, 21 Apr 2006 01:33:16 -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
Modified Files:
crm-1.0.dtd
Log Message:
Allow is_managed and resource_stickiness to be "set" to the cluster's global
value.
Update the DTD
- allow "default" as a value for is_managed
- Dont restrict resource_stickiness to and +/-INFINITY, it can be any integer
or "default"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- crm-1.0.dtd 19 Apr 2006 14:21:05 -0000 1.62
+++ crm-1.0.dtd 21 Apr 2006 07:33:15 -0000 1.63
@@ -65,10 +65,10 @@
type CDATA #REQUIRED
provider CDATA #IMPLIED
- is_managed (true|1|false|0) 'true'
+ is_managed (true|1|false|0|default) 'default'
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
- resource_stickiness (0|INFINITY|-INFINITY) '0'>
+ resource_stickiness CDATA #IMPLIED>
<!-- Annotated version -->
<!ELEMENT operations (op*)>
@@ -90,10 +90,10 @@
id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|1|false|0) 'true'
+ is_managed (true|1|false|0|default) 'default'
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
- resource_stickiness (0|INFINITY|-INFINITY) '0'
+ resource_stickiness CDATA #IMPLIED
ordered (true|1|false|0) 'true'
collocated (true|1|false|0) 'true'>
@@ -102,10 +102,10 @@
id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|1|false|0) 'true'
+ is_managed (true|1|false|0|default) 'default'
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
- resource_stickiness (0|INFINITY|-INFINITY) '0'
+ resource_stickiness CDATA #IMPLIED
notify (true|1|false|0) 'false'
globally_unique (true|1|false|0) 'true'
@@ -118,10 +118,10 @@
id CDATA #REQUIRED
description CDATA #IMPLIED
- is_managed (true|1|false|0) 'true'
+ is_managed (true|1|false|0|default) 'default'
restart_type (ignore|restart) 'ignore'
multiple_active (stop_start|stop_only|block) 'stop_start'
- resource_stickiness (0|INFINITY|-INFINITY) '0'
+ resource_stickiness CDATA #IMPLIED
notify (true|1|false|0) 'false'
globally_unique (true|1|false|0) 'true'
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 112
*********************************************
