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: heartbeat by andrew from
([email protected])
2. Linux-HA CVS: cts by andrew from
([email protected])
3. Linux-HA CVS: heartbeat by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 19 Apr 2006 06:16:00 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
heartbeat.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/heartbeat/heartbeat.c,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -3 -r1.500 -r1.501
--- heartbeat.c 7 Apr 2006 12:51:25 -0000 1.500
+++ heartbeat.c 19 Apr 2006 12:15:59 -0000 1.501
@@ -2,7 +2,7 @@
* TODO:
* 1) Man page update
*/
-/* $Id: heartbeat.c,v 1.500 2006/04/07 12:51:25 lars Exp $ */
+/* $Id: heartbeat.c,v 1.501 2006/04/19 12:15:59 andrew Exp $ */
/*
* heartbeat: Linux-HA heartbeat code
*
@@ -2113,7 +2113,7 @@
/* Whack 'em */
hb_kill_core_children(SIGKILL);
- cl_log(LOG_INFO,"Heartbeat shutdown complete.");
+ cl_log(LOG_INFO,"%s Heartbeat shutdown complete.", localnodename);
if (procinfo->restart_after_shutdown) {
cl_log(LOG_INFO, "Heartbeat restart triggered.");
@@ -3392,7 +3392,8 @@
, (int) p->pid, CoreProcessCount);
if (CoreProcessCount <= 1) {
- cl_log(LOG_INFO,"Heartbeat shutdown complete.");
+ cl_log(LOG_INFO,"%s Heartbeat shutdown complete.",
+ localnodename);
if (procinfo->restart_after_shutdown) {
cl_log(LOG_INFO
, "Heartbeat restart triggered.");
@@ -6236,6 +6237,9 @@
/*
* $Log: heartbeat.c,v $
+ * Revision 1.501 2006/04/19 12:15:59 andrew
+ * Tweak some log patterns to work regardless of how they're logged (syslog
vs. file)
+ *
* Revision 1.500 2006/04/07 12:51:25 lars
* CID #25: RESOURCE_LEAK, fp was not being freed.
*
------------------------------
Message: 2
Date: Wed, 19 Apr 2006 06:17:17 -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:
CTSlab.py.in
Log Message:
Set some options in BSC mode
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- CTSlab.py.in 3 Apr 2006 08:38:37 -0000 1.58
+++ CTSlab.py.in 19 Apr 2006 12:17:17 -0000 1.59
@@ -26,7 +26,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from UserDict import UserDict
-import sys, time, types, syslog, random, os, string, signal, traceback
+import sys, time, types, string, syslog, random, os, string, signal, traceback
from CTS import ClusterManager
from CM_hb import HeartbeatCM
from CTStests import BSC_AddResource
@@ -584,13 +584,7 @@
else:
usage(args[i+1])
elif args[i] == "--bsc":
- skipthis=1
- if args[i+1] == "1" or args[i+1] == "yes":
- DoBSC=1
- elif args[i+1] == "0" or args[i+1] == "no":
- DoSBC=0
- else:
- usage(args[i+1])
+ DoBSC=1
elif args[i] == "--standby":
skipthis=1
if args[i+1] == "1" or args[i+1] == "yes":
@@ -658,6 +652,11 @@
config = CM_hb.HBConfig(HAdir)
node_list = config.Parameters["node"]
+ if DoBSC:
+ NumIter = 2
+ Version = 2
+ LimitNodes = 1
+
if LogFacility == None:
if config.Parameters.has_key("logfacility"):
LogFacility = config.Parameters["logfacility"][0]
@@ -671,6 +670,11 @@
while len(node_list) > LimitNodes:
node_list.pop(len(node_list)-1)
+# alt_list = []
+# for node in node_list:
+# alt_list.append(string.lower(node))
+# node_list = alt_list
+
Environment = CtsLab(node_list)
Environment["HAdir"] = HAdir
Environment["ClobberCIB"] = ClobberCIB
@@ -687,7 +691,6 @@
Environment["RecvLoss"] = RecvLoss
Environment["IPBase"] = IPBase
Environment["SuppressCib"] = SuppressCib
- Environment["DoBSC"] = DoBSC
Environment["use_logd"] = 0
Environment["logfacility"] = LogFacility
@@ -702,6 +705,17 @@
Environment["RandSeed"] = Seed
Environment["reset"] = Stonith(sttype="external/ssh",
parm=string.join(node_list, " "))
+
+ if DoBSC:
+ Environment["DoBSC"] = 1
+ Environment["ClobberCIB"] = 1
+ Environment["CIBResource"] = 0
+ Environment["logger"] = (FileLog(Environment), StdErrLog(Environment))
+ scenario = Scenario([ BasicSanityCheck(Environment) ])
+ else:
+ scenario = Scenario(
+ [ InitClusterManager(Environment), PacketLoss(Environment)])
+
Environment.SupplyDefaults()
# Your basic start up the world type of test scenario...
@@ -709,17 +723,11 @@
#scenario = Scenario(
#[ InitClusterManager(Environment)
#, PingFest(Environment)])
- if Environment["DoBSC"]:
- scenario = Scenario([ BasicSanityCheck(Environment) ])
- NumIter = 2
- else:
- scenario = Scenario(
- [ InitClusterManager(Environment), PacketLoss(Environment)])
# Create the Cluster Manager object
-
cm = Environment['CMclass'](Environment)
if TruncateLog:
+ cm.log("Truncating %s" % LogFile)
lf = open(LogFile, "w");
if lf != None:
lf.truncate(0)
@@ -774,3 +782,10 @@
traceback.print_exc(50, logmethod)
tests.summarize()
+ if test.Stats["failure"] > 0:
+ sys.exit(test.Stats["failure"])
+
+ elif test.Stats["success"] != NumIter:
+ cm.Env.log("No failure count but success != requested iterations")
+ sys.exit(1)
+
------------------------------
Message: 3
Date: Wed, 19 Apr 2006 06:22:09 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/lib
Modified Files:
BasicSanityCheck.in
Log Message:
Use CTS for checking basic sanity of the CRM and remove the bloody aweful
scripts that used to do the job
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/lib/BasicSanityCheck.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- BasicSanityCheck.in 10 Apr 2006 16:46:16 -0000 1.96
+++ BasicSanityCheck.in 19 Apr 2006 12:22:08 -0000 1.97
@@ -34,7 +34,7 @@
[EMAIL PROTECTED]@/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/stonith
[EMAIL PROTECTED]@/
-HBLIB=$LIBDIR/heartbeat
[EMAIL PROTECTED]@/heartbeat
APPHBD=$HBLIB/apphbd
[EMAIL PROTECTED]@/cl_status
APPHBTEST=$HBLIB/apphbtest
@@ -42,7 +42,7 @@
MGMTDTEST=$HBLIB/mgmtdtest
LRMTEST=$HBLIB/lrmtest/LRMBasicSanityCheck
STONITHDTEST=$HBLIB/stonithdtest/STONITHDBasicSanityCheck
-CRMTEST=$HBLIB/crmtest/1node.sh
+CRMTEST="python $HBLIB/cts/CTSlab.py --bsc"
SNMPAGENTTEST=$HBLIB/SNMPAgentSanityCheck
BASE64_MD5_TEST=$HBLIB/base64_md5_test
MALLOC_CHECK_=2; export MALLOC_CHECK_
@@ -781,30 +781,18 @@
}
TestCRM() {
- if [ ! -f $CRMTEST ]; then
- return 0
- fi
- CRM_LOG=`maketempfile`
GenerateCrmdHaCf $HADIR/ha.cf $HADIR/ha_logd.cf
-# echo "crm yes" >> $HADIR/ha.cf
echo "Starting CRM tests" | tee -a $LOGFILE
-
- $CRMTEST -B -d /tmp -l $LOGFILE --ip1 127.0.0.10 --ip2 127.0.0.11 >
$CRM_LOG 2>&1
+ $CRMTEST -L $LOGFILE >/dev/null 2>&1
ret=$?
if [ $ret != 0 ]; then
errcount=`expr $errcount + 1`
- echo "CRM tests failed."
- echo "Summary of CRM test" >> $LOGFILE
- cat $CRM_LOG >> $LOGFILE
- else
- echo "CRM tests passed."
- fi
-
- # stat likes dumping core when MALLOC_CHECK_=2 is specified
- file $HADIR/core* | grep -e "from 'stat'" | rm -f `awk '{ print $1 }' |
tr ':' ' '`
-
- rm $CRM_LOG
+ echo "CRM tests failed (rc=$ret)." | tee -a $LOGFILE
+ return 1
+ fi
+ echo "CRM tests passed." | tee -a $LOGFILE
+ return 0
}
TestMgmtd() {
------------------------------
_______________________________________________
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 98
********************************************
