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: crm by andrew from
([email protected])
3. Linux-HA CVS: cts by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 19 Apr 2006 06:08:30 -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:
CTStests.py.in
Log Message:
Dont test logging in BSC mode
Fix the patterns for ResourceRecover
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTStests.py.in,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -3 -r1.143 -r1.144
--- CTStests.py.in 19 Apr 2006 06:04:41 -0000 1.143
+++ CTStests.py.in 19 Apr 2006 12:08:29 -0000 1.144
@@ -149,11 +149,6 @@
Set up the given scenario, then run the selected tests at
random for the selected number of iterations.
''')
-
- if not self.CM.TestLogging():
- sys.exit(1)
- if not self.CM.CheckDf():
- sys.exit(1)
BadNews=CTS.LogWatcher(self.CM["LogFileName"], self.CM["BadRegexes"]
, timeout=0)
BadNews.setwatch()
@@ -193,8 +188,11 @@
# Better get the current info from the cluster...
self.CM.statall()
# Make sure logging is working and we have enough disk space...
- self.CM.TestLogging()
- self.CM.CheckDf()
+ if not self.CM.Env["DoBSC"]:
+ if not self.CM.TestLogging():
+ sys.exit(1)
+ if not self.CM.CheckDf():
+ sys.exit(1)
stoptime=time.time()
elapsed_time = stoptime - starttime
test_time = stoptime - test.starttime
@@ -1576,7 +1574,7 @@
self.CM.log("...resource %s on %s" % (label, nodes[0]))
- pat=("""crmd:.* Performing op start on %s""" % (resource. rid))
+ pat=("""crmd.* Performing op start on %s""" % (resource.rid))
watch = CTS.LogWatcher(self.CM["LogFileName"], [pat], timeout=240)
watch.setwatch()
@@ -1619,7 +1617,7 @@
#
def errorstoignore(self):
'''Return list of errors which should be ignored'''
- return [ """ERROR: .* Action .*_monitor_.* on .* failed .*rc: 0 vs.
7.*: Error""" % self.rid,
+ return [ """ERROR: .* Action .*%s_monitor_.* on .* failed .*rc: 0 vs.
7.*: Error""" % self.rid,
"""Updating failcount for """
]
@@ -2117,10 +2115,10 @@
self.resource_offset = self.resource_offset + 1
r_id = "bsc-rsc-%s-%d" % (node, self.resource_offset)
- start_pat = "%s crmd:.*Performing op start(.*) on %s"
+ start_pat = "crmd.*start_0 on %s complete"
patterns = []
- patterns.append(start_pat % (node, r_id))
+ patterns.append(start_pat % r_id)
watch = CTS.LogWatcher(
self.CM["LogFileName"], patterns, self.CM["DeadTime"])
------------------------------
Message: 2
Date: Wed, 19 Apr 2006 06:15:59 -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/crmd
Modified Files:
fsa.c
Log Message:
Tweak some log patterns to work regardless of how they're logged (syslog vs.
file)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- fsa.c 11 Apr 2006 07:37:54 -0000 1.142
+++ fsa.c 19 Apr 2006 12:15:59 -0000 1.143
@@ -600,9 +600,9 @@
state_from, state_to, input, fsa_cause2string(cause),
msg_data->origin);
- crm_info("State transition %s -> %s [ input=%s cause=%s origin=%s ]",
- state_from, state_to, input, fsa_cause2string(cause),
- msg_data->origin);
+ crm_info("%s: State transition %s -> %s [ input=%s cause=%s origin=%s
]",
+ fsa_our_uname, state_from, state_to, input,
+ fsa_cause2string(cause), msg_data->origin);
/* the last two clauses might cause trouble later */
if(election_timeout != NULL
------------------------------
Message: 3
Date: Wed, 19 Apr 2006 06:16:00 -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
Log Message:
Tweak some log patterns to work regardless of how they're logged (syslog vs.
file)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CM_LinuxHAv2.py.in,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- CM_LinuxHAv2.py.in 18 Apr 2006 16:09:53 -0000 1.145
+++ CM_LinuxHAv2.py.in 19 Apr 2006 12:16:00 -0000 1.146
@@ -80,18 +80,19 @@
"StandbyQueryCmd" : "@sbindir@/crm_standby -GQ -U %s
2>/dev/null",
# Patterns to look for in the log files for various occasions...
- "Pat:DC_IDLE" : "crmd:.*State transition.*-> S_IDLE",
+ "Pat:DC_IDLE" : "crmd.*State transition.*-> S_IDLE",
# This wont work if we have multiple partitions
# Use: "Pat:They_started" : "%s crmd:.*State transition.*->
S_NOT_DC",
"Pat:They_started" : "Updating node state to member for %s",
- "Pat:We_started" : "%s crmd:.*State transition.*-> S_IDLE",
- "Pat:We_stopped" : "%s heartbeat.*Heartbeat shutdown complete",
+ "Pat:We_started" : "crmd.*%s: State transition.*-> S_IDLE",
+ "Pat:We_stopped" : "heartbeat.*%s.*Heartbeat shutdown complete",
"Pat:Logd_stopped" : "%s logd:.*Exiting write process",
"Pat:They_stopped" : "%s crmd:.*LOST:.* %s ",
- "Pat:All_stopped" : "%s .*heartbeat.*Heartbeat shutdown complete",
+ "Pat:All_stopped" : "heartbeat.*%s.*Heartbeat shutdown complete",
"Pat:They_dead" : "node %s.*: is dead",
"Pat:TransitionComplete" : "Transition status: Complete: complete",
+
# Bad news Regexes. Should never occur.
"BadRegexes" : (
@@ -107,9 +108,9 @@
r"input=I_ERROR",
r", exiting\.",
r"WARN.*Ignoring HA message.*vote.*not in our membership list",
- r"pengine:.*Attempting recovery of resource",
- r"pengine:.*Handling failed ",
- r"tengine:.*is taking more than 2x its timeout",
+ r"pengine.*Attempting recovery of resource",
+ r"pengine.*Handling failed ",
+ r"tengine.*is taking more than 2x its timeout",
r"Confirm not received from",
r"Welcome reply not received from",
r"Attempting to schedule .* after a stop",
@@ -118,6 +119,10 @@
),
})
del self["Standby"]
+ if self.Env["DoBSC"]:
+ del self["Pat:They_stopped"]
+ del self["Pat:Logd_stopped"]
+
self.check_transitions = 0
self.check_elections = 0
self.CIBsync = {}
@@ -153,14 +158,13 @@
os.system("rm -f "+cib_file)
self.debug("Creating new CIB for " + node + " in: " + cib_file)
os.system("echo \'" + self.default_cts_cib + "\' > " +
cib_file)
- if 0!=self.rsh.cp(cib_file,"root@" + (self["CIBfile"]%node)):
- raise ValueError("Can not scp file to %s "%node)
+ if 0!=self.rsh.echo_cp(None, cib_file, node,
"@HA_VARLIBDIR@/heartbeat/crm/cib.xml"):
+ raise ValueError("Can not create CIB on %s "%node)
os.system("rm -f "+cib_file)
else:
self.debug("Installing CIB (%s) on node %s"
%(self.Env["CIBfilename"], node))
- if 0!=self.rsh.cp(self.Env["CIBfilename"],
- "root@" + (self["CIBfile"]%node)):
+ if 0!=self.rsh.cp(self.Env["CIBfilename"], "root@" +
(self["CIBfile"]%node)):
raise ValueError("Can not scp file to %s "%node)
self.rsh.remote_py(node, "os", "system", "chown @HA_CCMUSER@
@HA_VARLIBDIR@/heartbeat/crm/cib.xml")
@@ -324,9 +328,10 @@
os.system("echo \'"+ self.default_cts_cib +"\' > "+ cib_file)
else:
os.system("cp "+self.Env["CIBfilename"]+" "+cib_file)
- else:
- if
0!=self.rsh.cp("root@"+self["CIBfile"]%self.Env["nodes"][0],cib_file):
- raise ValueError("Can not copy file to %s, maybe permission
denied"%self["TmpDir"])
+ else:
+ if 0 != self.rsh.echo_cp(
+ self.Env["nodes"][0], "@HA_VARLIBDIR@/heartbeat/crm/cib.xml",
None, cib_file):
+ raise ValueError("Can not copy file to %s, maybe permission
denied"%cib_file)
self.config = parse(cib_file)
os.remove(cib_file)
------------------------------
_______________________________________________
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 97
********************************************
