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: website by alan from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 11 Apr 2006 05:16:32 -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:
CM_LinuxHAv2.py.in CTS.py.in
Log Message:
Better deal with nodes appearing during startup
Only install the CIB on the first node, remove it from all others (they'll
pick it up from the first node when they start)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -3 -r1.143 -r1.144
--- CM_LinuxHAv2.py.in 3 Apr 2006 08:54:08 -0000 1.143
+++ CM_LinuxHAv2.py.in 11 Apr 2006 11:16:31 -0000 1.144
@@ -51,6 +51,7 @@
def __init__(self, Environment, randseed=None):
HeartbeatCM.__init__(self, Environment, randseed=randseed)
+ self.cib_installed = 0
self.config = None
self.cluster_monitor = 0
self.use_short_names = 1
@@ -136,6 +137,14 @@
def install_config(self, node):
if not self.CIBsync.has_key(node) and self.Env["ClobberCIB"] == 1:
self.CIBsync[node] = 1
+ self.rsh.remote_python_call(node, "os", "system", "rm -f
@HA_VARLIBDIR@/heartbeat/crm/cib.xml")
+ self.rsh.remote_python_call(node, "os", "system", "rm -f
@HA_VARLIBDIR@/heartbeat/crm/cib.xml.sig")
+
+ # Only install the CIB on the first node, all the other ones will
pick it up from there
+ if self.cib_installed == 1:
+ return None
+
+ self.cib_installed = 1
if self.Env["CIBfilename"] == None:
self.debug("Installing Generated CIB on node %s" %(node))
warnings.filterwarnings("ignore")
@@ -155,7 +164,6 @@
raise ValueError("Can not scp file to %s "%node)
self.rsh.remote_python_call(node, "os", "system", "chown
@HA_CCMUSER@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml")
- self.rsh.remote_python_call(node, "os", "system", "rm -f
@HA_VARLIBDIR@/heartbeat/crm/cib.xml.sig")
def prepare(self):
'''Finish the Initialization process. Prepare to test...'''
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTS.py.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- CTS.py.in 27 Mar 2006 07:15:29 -0000 1.53
+++ CTS.py.in 11 Apr 2006 11:16:31 -0000 1.54
@@ -452,7 +452,7 @@
return 1
if not self.ns.WaitForNodeToComeUp(node):
- self.log("WaitForNodeToComeUp %s filed" % node)
+ self.log("WaitForNodeToComeUp %s failed" % node)
return 0
patterns = []
@@ -474,6 +474,14 @@
# 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
+
+ if self.StataCM(node) and self.cluster_stable(self["DeadTime"]):
+ self.log ("%s was already started" %(node))
+ return 1
+
if self.rsh(node, self["StartCmd"]) != 0:
self.log ("Warn: Start command failed on node %s" %(node))
return None
------------------------------
Message: 2
Date: Tue, 11 Apr 2006 08:18:51 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: website by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : website
Dir : linux-ha/website
Modified Files:
trick.php
Log Message:
Put in some changes to account for some unexplained changes in MoinMoin.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/website/trick.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- trick.php 5 Jan 2006 08:39:34 -0000 1.12
+++ trick.php 11 Apr 2006 14:18:50 -0000 1.13
@@ -38,13 +38,13 @@
global $MOINMOINpagename;
$MOINMOINExtraneousImages = array(
- '/wiki/modern/img/moin-diff.png',
- '/wiki/modern/img/moin-ftp.png',
- '/wiki/modern/img/moin-rss.png',
- '/wiki/modern/img/moin-inter.png',
- '/wiki/modern/img/moin-www.png',
- '/wiki/modern/img/moin-top.png',
- '/wiki/modern/img/moin-bottom.png',
+ '/wiki/(classic|modern)/img/moin-diff.png',
+ '/wiki/(classic|modern)/img/moin-ftp.png',
+ '/wiki/(classic|modern)/img/moin-rss.png',
+ '/wiki/(classic|modern)/img/moin-inter.png',
+ '/wiki/(classic|modern)/img/moin-www.png',
+ '/wiki/(classic|modern)/img/moin-top.png',
+ '/wiki/(classic|modern)/img/moin-bottom.png',
);
$MOINMOINCacheLimit = array("RecentChanges" => 300);
@@ -87,11 +87,11 @@
# in case there is some wiki style escaped special char in the pagename
derived from the url
# $pagetitle is only used in the "title" tag, and should be readable
# (typically displayed as window/tab title by your browser)
-$pagetitle = str_replace(array("_20","_21","_2c", "_2d","_2e","_2f","_27",
"_28", "_29", "_3a"), array(" ","!",",","-",".","/","'","(",")",":"),
$MOINMOINpagename);
+$pagetitle = str_replace(array("_20","_21","_2c", "_2d","_2f","_27", "_28",
"_29", "_3a"), array(" ","!",",","-","/","'","(",")",":"), $MOINMOINpagename);
# in case there are some special chars in the page name, that are not yet
escaped ...
# $MOINMOINpagename is used to request that page from the wiki, or to read in
the cache file
-$MOINMOINpagename = str_replace(array(" ","!",",","-",".","'","(",")",":"),
array("_20","_21","_2c", "_2d","_2e","_27", "_28", "_29", "_3a"),
$MOINMOINpagename);
+$MOINMOINpagename = str_replace(array(" ","!",",","-","'","(",")",":"),
array("_20","_21","_2c", "_2d","_27", "_28", "_29", "_3a"), $MOINMOINpagename);
$content = MoinMoin($MOINMOINpagename);
------------------------------
_______________________________________________
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 74
********************************************
