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: cts by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 13 Mar 2006 02:40:24 -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:
just made a mistake, rolled back to the previouse version
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- CTSlab.py.in 13 Mar 2006 09:36:24 -0000 1.52
+++ CTSlab.py.in 13 Mar 2006 09:40:23 -0000 1.53
@@ -339,7 +339,7 @@
def SupplyDefaults(self):
if not self.has_key("logger"):
- self["logger"] = (FileLog(self), StdErrLog(self))
+ self["logger"] = (SysLog(self), StdErrLog(self))
if not self.has_key("reset"):
self["reset"] = Stonith()
if not self.has_key("CMclass"):
------------------------------
Message: 2
Date: Mon, 13 Mar 2006 02:42:42 -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:
CIB.py.in CTSlab.py.in
Log Message:
Added option seed for user specified random seed, bug # 1125
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- CIB.py.in 13 Mar 2006 09:37:50 -0000 1.3
+++ CIB.py.in 13 Mar 2006 09:42:42 -0000 1.4
@@ -8,7 +8,7 @@
'''
from UserDict import UserDict
-import sys, time, types, syslog, whrandom, os, struct, string, signal,
traceback
+import sys, time, types, syslog, os, struct, string, signal, traceback
from CTS import ClusterManager
from CM_hb import HeartbeatCM
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- CTSlab.py.in 13 Mar 2006 09:40:23 -0000 1.53
+++ CTSlab.py.in 13 Mar 2006 09:42:42 -0000 1.54
@@ -339,7 +339,7 @@
def SupplyDefaults(self):
if not self.has_key("logger"):
- self["logger"] = (SysLog(self), StdErrLog(self))
+ self["logger"] = (FileLog(self), StdErrLog(self))
if not self.has_key("reset"):
self["reset"] = Stonith()
if not self.has_key("CMclass"):
@@ -361,9 +361,11 @@
if self.has_key("RandSeed"):
randseed = self["RandSeed"]
self.log("Random seed is: " + str(randseed))
- self.RandomGen.seed(randseed)
+ self.RandomGen.seed(str(randseed))
else:
- self.RandomGen.seed()
+ randseed = int(time.time())
+ self.log("Random seed is: " + str(randseed))
+ self.RandomGen.seed(str(randseed))
def log(self, args):
"Log using each of the supplied logging methods"
@@ -421,12 +423,12 @@
#
# Initial Random seed...
#
- elif key == "RandSeed":
- if len(value) != 3:
- raise ValueError("'Randseed' must be a 3-element list/tuple")
- for elem in value:
- if not isinstance(elem, types.IntType):
- raise ValueError("'Randseed' list must all be ints")
+ #elif key == "RandSeed":
+ # if len(value) != 3:
+ # raise ValueError("'Randseed' must be a 3-element list/tuple")
+ # for elem in value:
+ # if not isinstance(elem, types.IntType):
+ # raise ValueError("'Randseed' list must all be ints")
self.data[key] = value
@@ -483,6 +485,8 @@
+ " --fencing (1 | 0 | yes | no)" \
+ " --suppress_cib_writes (1 | 0 | yes | no)" \
+ " -lstests" \
+ + " --resource-class (ocf | heartbeat)" \
+ + " --seed" \
+ " [number-of-iterations]"
sys.exit(1)
@@ -520,7 +524,7 @@
DoBSC = 0
ListTests = 0
ResourceClass = "ocf"
-
+ HaveSeed = 0
#
# The values of the rest of the parameters are now properly derived from
# the configuration files.
@@ -643,6 +647,10 @@
elif args[i] == "--resource-class":
skipthis=1
ResourceClass = args[i+1]
+ elif args[i] == "--seed":
+ skipthis=1
+ Seed=args[i+1]
+ HaveSeed = 1
else:
NumIter=int(args[i])
@@ -695,7 +703,9 @@
if Version == 2:
from CM_LinuxHAv2 import LinuxHAv2
Environment['CMclass']=LinuxHAv2
- #Environment["RandSeed"] = (156, 104, 218)
+
+ if HaveSeed:
+ Environment["RandSeed"] = Seed
Environment["reset"] = Stonith(sttype="external/ssh",
parm=string.join(node_list, " "))
Environment.SupplyDefaults()
------------------------------
Message: 3
Date: Mon, 13 Mar 2006 02:46:16 -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:
Should be SysLog
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- CTSlab.py.in 13 Mar 2006 09:42:42 -0000 1.54
+++ CTSlab.py.in 13 Mar 2006 09:46:16 -0000 1.55
@@ -339,7 +339,7 @@
def SupplyDefaults(self):
if not self.has_key("logger"):
- self["logger"] = (FileLog(self), StdErrLog(self))
+ self["logger"] = (SysLog(self), StdErrLog(self))
if not self.has_key("reset"):
self["reset"] = Stonith()
if not self.has_key("CMclass"):
------------------------------
_______________________________________________
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 27
********************************************
