#At file:///space/cluster_rep_auto/ based on revid:jbmiller@stripped
20 Jonathan.Miller@stripped 2009-02-13
latest updates and adds for ACRT
removed:
atrt-tests-lists/linux.ndb18/clst-rep-tests.txt
configurations/linux.ndb18/conf-2-dn-func.cnf
nohup.out
tests/tpcb/extras/
tests/tpcb/extras/load_and_delete.pl
tests/tpcb/extras/loop.sh
added:
atrt-tests-lists/linux.ndb18/2-dn-atomics-tests.txt
atrt-tests-lists/linux.ndb18/2-dn-dd-tests.txt
atrt-tests-lists/linux.ndb18/2-dn-tpcb-tests.txt
atrt-tests-lists/linux.ndb18/4-dn-mt-8-mixed-tests.txt
atrt-tests-lists/linux.ndb18/clst-rep-mt-mixed-tests.txt
autotest-os-conf-hold/cr-autotest-sols.conf
configurations/linux.ndb18/2-dn-atomics.cnf
configurations/linux.ndb18/2-dn-func.cnf
configurations/linux.ndb18/2-dn-tpcb.cnf
configurations/linux.ndb18/conf-2-dn-dd.cnf
configurations/linux.ndb18/conf-4-dn-func.cnf
configurations/linux.ndb18/conf-4-dn-mt-8-mixed.cnf
configurations/linux.ndb18/conf-4-dn-perf.cnf
configurations/linux.ndb18/conf-clst-rep-mt-mixed.cnf
drivers/ins-del-tester.sh
drivers/ndbatomics-dd-ldf-tester.sh
drivers/ndbatomics-one-tester.sh
tests/insert_delete/
tests/insert_delete/load_and_delete.pl
tests/insert_delete/logo-mysql.jpg
tests/insert_delete/loop.sh
tests/ndbatomics/src/NDBAtomics
tools/timer.pl
modified:
atrt-tests-lists/linux.ndb18/2-dn-func-tests.txt
atrt-tests-lists/linux.ndb18/2-dn-mt-6-tests.txt
atrt-tests-lists/linux.ndb18/2-dn-mt-8-mixed-tests.txt
atrt-tests-lists/linux.ndb18/2-dn-mt-8-tests.txt
atrt-tests-lists/linux.ndb18/2-dn-mt-tests.txt
atrt-tests-lists/linux.ndb18/2-dn-perf-tests.txt
atrt-tests-lists/linux.ndb18/4-dn-func-tests.txt
atrt-tests-lists/linux.ndb18/4-dn-mt-6-tests.txt
atrt-tests-lists/linux.ndb18/4-dn-mt-8-tests.txt
atrt-tests-lists/linux.ndb18/4-dn-perf-tests.txt
autotest-os-conf-hold/cr-autotest.conf.fimafeng08
autotest-os-conf-hold/cr-autotest.conf.ndb13
autotest-os-conf-hold/cr-autotest.conf.ndb18
back_it.sh
configurations/linux.ndb18/conf-2-dn-mt-6.cnf
configurations/linux.ndb18/conf-2-dn-mt-8-mixed.cnf
configurations/linux.ndb18/conf-2-dn-mt-8.cnf
configurations/linux.ndb18/conf-2-dn-mt.cnf
configurations/linux.ndb18/conf-2-dn-old.cnf
configurations/linux.ndb18/conf-2-dn-perf.cnf
configurations/linux.ndb18/conf-2-dn.cnf
configurations/linux.ndb18/conf-4-dn-mt-6.cnf
configurations/linux.ndb18/conf-4-dn-mt-8.cnf
configurations/linux.ndb18/conf-4-dn.cnf
configurations/linux.ndb18/conf-clst-rep-strss.cnf
configurations/linux.ndb18/conf-clst-rep.cnf
configurations/linux.ndb18/conf-stress.cnf
cr-autotest.conf
crontab.examples
drivers/add-online-tester.sh
drivers/cge-rep-tester.sh
drivers/cge-tester.sh
drivers/ins-del-rep-tester.sh
drivers/joins-tester.sh
drivers/ndbatomics-dd-tester.sh
drivers/ndbatomics-tester.sh
drivers/restore-rep-tester.sh
drivers/restore-tester.sh
drivers/sony-tester.sh
drivers/stress-tester.sh
drivers/sysbench-oltp-tester.sh
drivers/tpcb-perl-tester.sh
drivers/tpcb-rep-tester.sh
drivers/tpcb-tester.sh
drivers/tpcc-dd-rep-tester.sh
drivers/tpcc-dd-tester.sh
drivers/tpcc-rep-tester.sh
drivers/tpcc-tester.sh
in-queue.txt
scripts/boot.sh
scripts/cleanup.sh
scripts/clones.sh
scripts/run_test.sh
tests/benchmark/sysbench-0.4.8/Makefile
tests/benchmark/sysbench-0.4.8/config.log
tests/benchmark/sysbench-0.4.8/config.status
tests/benchmark/sysbench-0.4.8/doc/Makefile
tests/benchmark/sysbench-0.4.8/scripts/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/drivers/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/drivers/mysql/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/drivers/oracle/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/drivers/pgsql/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/tests/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/tests/cpu/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/tests/fileio/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/tests/memory/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/tests/mutex/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/tests/oltp/Makefile
tests/benchmark/sysbench-0.4.8/sysbench/tests/threads/Makefile
tests/joinAtomics/src/Join.cpp
tests/joinAtomics/src/JoinsTest
tests/ndbatomics/load_atomics.pl
tests/ndbatomics/src/Atomics.cpp
tests/tpcb/tpcbSql
tests/tpcb/tpcbSql_src/src/tpcb.cpp
tools/mail.list
tools/resultsDBinit.pl
tools/resultsDBreport.pl
=== added file 'atrt-tests-lists/linux.ndb18/2-dn-atomics-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-atomics-tests.txt 1970-01-01 00:00:00 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-atomics-tests.txt 2009-02-13 21:08:34 +0000
@@ -0,0 +1,6 @@
+# BASIC FUNCTIONALITY
+max-time: 4000
+cmd: ndbatomics-one-tester.sh
+args:../../../bin/cr-autotest.conf
+
+
=== added file 'atrt-tests-lists/linux.ndb18/2-dn-dd-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-dd-tests.txt 1970-01-01 00:00:00 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-dd-tests.txt 2009-02-13 21:08:34 +0000
@@ -0,0 +1,12 @@
+# BASIC FUNCTIONALITY
+max-time: 4000
+cmd: ndbatomics-dd-ldf-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: tpcc-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4000
+cmd: ndbatomics-dd-tester.sh
+args:../../../bin/cr-autotest.conf
=== modified file 'atrt-tests-lists/linux.ndb18/2-dn-func-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-func-tests.txt 2008-12-15 22:13:26 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-func-tests.txt 2009-02-13 21:08:34 +0000
@@ -1,8 +1,4 @@
# BASIC FUNCTIONALITY
-max-time: 4600
-cmd: cge-tester.sh
-args:../../../bin/cr-autotest.conf
-
max-time: 3200
cmd: joins-tester.sh
args:../../../bin/cr-autotest.conf
@@ -11,6 +7,10 @@ max-time: 6000
cmd: add-online-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: cge-tester.sh
+args:../../../bin/cr-autotest.conf
+
max-time: 6000
cmd: restore-tester.sh
args:../../../bin/cr-autotest.conf
=== modified file 'atrt-tests-lists/linux.ndb18/2-dn-mt-6-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-mt-6-tests.txt 2008-12-15 22:13:26 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-mt-6-tests.txt 2009-02-13 21:08:34 +0000
@@ -19,3 +19,8 @@ max-time: 4000
cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+
=== modified file 'atrt-tests-lists/linux.ndb18/2-dn-mt-8-mixed-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-mt-8-mixed-tests.txt 2008-12-15 22:13:26 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-mt-8-mixed-tests.txt 2009-02-13 21:08:34 +0000
@@ -19,3 +19,8 @@ max-time: 4000
cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+
=== modified file 'atrt-tests-lists/linux.ndb18/2-dn-mt-8-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-mt-8-tests.txt 2008-12-15 22:13:26 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-mt-8-tests.txt 2009-02-13 21:08:34 +0000
@@ -19,3 +19,8 @@ max-time: 4000
cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+
=== modified file 'atrt-tests-lists/linux.ndb18/2-dn-mt-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-mt-tests.txt 2008-12-15 22:13:26 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-mt-tests.txt 2009-02-13 21:08:34 +0000
@@ -19,3 +19,8 @@ max-time: 4000
cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+
=== modified file 'atrt-tests-lists/linux.ndb18/2-dn-perf-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-perf-tests.txt 2008-12-15 22:13:26 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-perf-tests.txt 2009-02-13 21:08:34 +0000
@@ -27,4 +27,8 @@ max-time: 4000
cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
=== added file 'atrt-tests-lists/linux.ndb18/2-dn-tpcb-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/2-dn-tpcb-tests.txt 1970-01-01 00:00:00 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-tpcb-tests.txt 2009-02-13 21:08:34 +0000
@@ -0,0 +1,4 @@
+# BASIC FUNCTIONALITY
+max-time: 4200
+cmd: tpcb-tester.sh
+args:../../../bin/cr-autotest.conf
=== modified file 'atrt-tests-lists/linux.ndb18/4-dn-func-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/4-dn-func-tests.txt 2008-12-17 15:05:57 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-func-tests.txt 2009-02-13 21:08:34 +0000
@@ -1,8 +1,4 @@
# BASIC FUNCTIONALITY
-max-time: 4600
-cmd: cge-tester.sh
-args:../../../bin/cr-autotest.conf
-
max-time: 3200
cmd: joins-tester.sh
args:../../../bin/cr-autotest.conf
@@ -11,6 +7,10 @@ max-time: 6000
cmd: add-online-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: cge-tester.sh
+args:../../../bin/cr-autotest.conf
+
max-time: 6000
cmd: restore-tester.sh
args:../../../bin/cr-autotest.conf
=== modified file 'atrt-tests-lists/linux.ndb18/4-dn-mt-6-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/4-dn-mt-6-tests.txt 2008-12-15 22:13:26 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-mt-6-tests.txt 2009-02-13 21:08:34 +0000
@@ -19,3 +19,8 @@ max-time: 4000
cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+
=== added file 'atrt-tests-lists/linux.ndb18/4-dn-mt-8-mixed-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/4-dn-mt-8-mixed-tests.txt 1970-01-01 00:00:00 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-mt-8-mixed-tests.txt 2009-02-13 21:08:34 +0000
@@ -0,0 +1,34 @@
+# BASIC FUNCTIONALITY
+max-time: 4200
+cmd: tpcb-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4000
+cmd: tpcc-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: sysbench-oltp-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 3200
+cmd: joins-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4000
+cmd: ndbatomics-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: tpcc-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4000
+cmd: ndbatomics-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+
=== modified file 'atrt-tests-lists/linux.ndb18/4-dn-mt-8-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/4-dn-mt-8-tests.txt 2008-12-15 22:13:26 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-mt-8-tests.txt 2009-02-13 21:08:34 +0000
@@ -19,3 +19,8 @@ max-time: 4000
cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+
=== modified file 'atrt-tests-lists/linux.ndb18/4-dn-perf-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/4-dn-perf-tests.txt 2008-12-17 15:05:57 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-perf-tests.txt 2009-02-13 21:08:34 +0000
@@ -27,4 +27,8 @@ max-time: 4000
cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
=== added file 'atrt-tests-lists/linux.ndb18/clst-rep-mt-mixed-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/clst-rep-mt-mixed-tests.txt 1970-01-01 00:00:00 +0000
+++ b/atrt-tests-lists/linux.ndb18/clst-rep-mt-mixed-tests.txt 2009-02-13 21:08:34 +0000
@@ -0,0 +1,21 @@
+# BASIC FUNCTIONALITY
+max-time: 1200
+cmd: tpcb-rep-tester.sh
+args:../../../../bin/cr-autotest.conf
+
+max-time: 2000
+cmd: tpcc-rep-tester.sh
+args:../../../../bin/cr-autotest.conf
+
+max-time: 3600
+cmd: tpcc-dd-rep-tester.sh
+args:../../../../bin/cr-autotest.conf
+
+max-time: 7200
+cmd: restore-rep-tester.sh
+args:../../../../bin/cr-autotest.conf
+
+max-time: 14200
+cmd: ins-del-rep-tester.sh
+args:../../../../bin/cr-autotest.conf
+
=== removed file 'atrt-tests-lists/linux.ndb18/clst-rep-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/clst-rep-tests.txt 2008-10-29 21:41:06 +0000
+++ b/atrt-tests-lists/linux.ndb18/clst-rep-tests.txt 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-# BASIC FUNCTIONALITY
-max-time: 1200
-cmd: tpcb-rep-tester.sh
-args:../../../../bin/cr-autotest.conf
-
-max-time: 2000
-cmd: tpcc-rep-tester.sh
-args:../../../../bin/cr-autotest.conf
-
-max-time: 3600
-cmd: tpcc-dd-rep-tester.sh
-args:../../../../bin/cr-autotest.conf
-
-max-time: 7200
-cmd: restore-rep-tester.sh
-args:../../../../bin/cr-autotest.conf
-
-max-time: 14200
-cmd: ins-del-rep-tester.sh
-args:../../../../bin/cr-autotest.conf
-
=== added file 'autotest-os-conf-hold/cr-autotest-sols.conf'
--- a/autotest-os-conf-hold/cr-autotest-sols.conf 1970-01-01 00:00:00 +0000
+++ b/autotest-os-conf-hold/cr-autotest-sols.conf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,272 @@
+#########################################
+# Author: Jeb
+# Purpose: Configurations file for Cluster
+# Replication Automated testing
+#########################################
+
+###################
+### Directories ###
+###################
+echo "*****************************************************************"
+echo "****************** Config File Start ****************************"
+echo "*****************************************************************"
+# ATRT Dirs #
+BASE_DIR=/home/ndbdev/ACRT
+#TODO Change the clone dir
+#CLONE_DIR=$BASE_DIR/ACRT_CLONES
+CLONE_DIR=/home/ndbdev/ACRT/CLONES
+BUILD_DIR=/export/home/tmp/ndb
+INSTALL_DIR=/export/home/tmp/ndb/cr_autotest
+INSTALL_BIN_DIR=$INSTALL_DIR/bin
+ATRT_DIR=$INSTALL_DIR/mysql-test/ndb
+
+# ACRT Dirs #
+## MAIN
+MAIN_TEST_DIR=/home/ndbdev/ACRT/sols/cluster_rep_auto
+## SUB
+TESTCASE_LOG_DIR=$MAIN_TEST_DIR/logs
+TEST_SCRIPTS_DIR=$MAIN_TEST_DIR/tests
+TEST_DRIVER_DIR=$MAIN_TEST_DIR/drivers
+TEST_TOOLS_DIR=$MAIN_TEST_DIR/tools
+TEST_LISTS_DIR=$MAIN_TEST_DIR/atrt-tests-lists/sols.techra29
+SCRIPTS=$MAIN_TEST_DIR/scripts
+CONFIGURATIONS=$MAIN_TEST_DIR/configurations/sols.techra29
+TEST_TMP_DIR=$MAIN_TEST_DIR/tmp
+
+##################
+### Controller ###
+##################
+
+DRIVER=techra29
+
+##############
+### MySQLD ###
+##############
+
+MASTER=$DRIVER
+MASTER_PORT=15001
+#This must be changed (ie. figure out how to set up the cluster on the machines I have available):
+SLAVE=techra35
+SLAVE_PORT=15003
+
+################
+### Cluster ####
+################
+
+NDB_MASTER=techra36
+NDB_MASTER_NODE_2=techra37
+NDB_MASTER_PORT=15000
+NDB_SLAVE=$SLAVE
+NDB_SLAVE_NODE2=techra35
+NDB_SLAVE_PORT=15002
+
+##################
+### Misc Items ###
+##################
+
+DATE=`date '+%Y-%m-%d'`
+DATE2=`date '+%Y-%m-%d_%H:%M'`
+#HOST=`hostname -s`
+HOST=`hostname`
+HOSTS="$MASTER $NDB_MASTER $NDB_MASTER_NODE_2 $SLAVE $NDB_SLAVE_NODE2"
+NEED_HOSTS=2
+INSTALL_LIB_DIR=$INSTALL_DIR/lib/mysql
+export INSTALL_LIB_DIR
+LD_LIBRARY_PATH=$INSTALL_LIB_DIR
+export LD_LIBRARY_PATH
+ADDTEST="-tests.txt"
+
+#############
+### Files ###
+#############
+
+## ATRT
+LOCK=$MAIN_TEST_DIR/TEST-RUNNING.LOCK
+ATRT=$ATRT_DIR/atrt
+SAVE_OUT_LOG=$TEST_TOOLS_DIR/atrt-analyze-result.sh
+CPCD_LOG=/tmp/cpcd-processes-logs.log
+
+## SCRIPTS
+RUNNER=$SCRIPTS/run_test.sh
+CLEANER=$SCRIPTS/cleanup.sh
+BOOT_SH=$SCRIPTS/boot.sh
+QUE_CLONE_FILE=$SCRIPTS/clones.sh
+STARTER=$SCRIPTS/starter.sh
+
+## TOOLS
+CHECK_LOAD=$TEST_TOOLS_DIR/check_db_load.pl
+CREATE_DISK_DATA=$TEST_TOOLS_DIR/create_dd.sh
+EXTRACT_DATA=$TEST_TOOLS_DIR/extractor.sh
+SLAVE_RESET=$TEST_TOOLS_DIR/resetslave.pl
+SLAVE_VERIFICATION=$TEST_TOOLS_DIR/verify_slave.pl
+WAIT_FOR_READY=$TEST_TOOLS_DIR/wait_for_sql_ready.pl
+RESULTS_DB_INIT=$TEST_TOOLS_DIR/resultsDBinit.pl
+RESULTS_DB_UPDATE=$TEST_TOOLS_DIR/resultsDBupdate.pl
+RESULTS_DB_REPORT=$TEST_TOOLS_DIR/resultsDBreport.pl
+STOP_SLAVE=$TEST_TOOLS_DIR/StopSlave.sql
+START_SLAVE=$TEST_TOOLS_DIR/StartSlave.sql
+RESET_SLAVE=$TEST_TOOLS_DIR/ResetSlave.sql
+RESET_MASTER=$TEST_TOOLS_DIR/ResetMaster.sql
+ACRT_REPORTING_TOOL=$TEST_TOOLS_DIR/sendTestResults.pl
+TIMER=$TEST_TOOLS_DIR/timer.pl
+##Changed perl version as this include more modules:
+PERL="/opt/csw/bin/perl -w"
+export PERL
+
+
+## MISC LOGS
+ATRT_LOG=$MAIN_TEST_DIR/cr-acrt.log
+RUNLOG=$MAIN_TEST_DIR/acrt-cron-log.txt
+REPORT_LOG=cr-report.txt
+QUE_ERROR_LOG=$MAIN_TEST_DIR/queue_error.log
+QUE_ADD_FILE=$MAIN_TEST_DIR/add-queue.txt
+IN_QUE=$MAIN_TEST_DIR/in-queue.txt
+CLONE_REVISION_LOG=$TESTCASE_LOG_DIR/clone-revision.log
+
+# Added by Jeb 2009/02/05
+TIMER_LOG=$TESTCASE_LOG_DIR/test-ops-times.csv
+TIMER_TMP=$TEST_TMP_DIR/test.timer
+
+
+##BIN
+MYSQL=$INSTALL_BIN_DIR/mysql
+NDB_RESTORE=$INSTALL_BIN_DIR/ndb_restore
+MYSQL_CONF=$INSTALL_BIN_DIR/mysql_config
+NDB_MGM=$INSTALL_BIN_DIR/ndb_mgm
+SLAP=$INSTALL_BIN_DIR/mysqlslap
+MYSQLDUMP=$INSTALL_BIN_DIR/mysqldump
+MYSQLSHOW=$INSTALL_BIN_DIR/mysqlshow
+NDB_SHOW_TABLES=$INSTALL_BIN_DIR/ndb_show_tables
+
+## DATA
+#NDB_2_FS=/data1/ndb_2_fs
+#NDB_3_FS=/data2/ndb_3_fs
+NDB_2_FS=/export/home/tmp/ndb
+NDB_3_FS=/export/home2/tmp/ndb
+
+## MISC
+QUE_ADD_FILE=$MAIN_TEST_DIR/add-queue.txt
+EMAIL_LIST=$TEST_TOOLS_DIR/mail.list
+REPORT_RESULTS=$TESTCASE_LOG_DIR/acrt-results.rpt
+
+####################
+### Results HOST ###
+####################
+
+#Note: Set these to "yes" when we want to publish results
+POST_RESULTS=""
+POST_TAR=""
+UPDATE_BM_DATABASE=""
+DO_REV_FILE=""
+SUMMARY_REPORT=""
+
+RESULT_HOST=ndbmaster.mysql.com
+RESULT_PATH="/bugs/acrt-results"
+
+################
+## RESULTS DB ##
+################
+RDBUSER=bmuser
+RDBPASS=telco64
+RDBHOST=ndbmaster
+RDBPORT=3306
+RDB=bm
+
+
+##########################################
+### Build Clone & Configuration Option ###
+##########################################
+
+BZR_CLONE_BASE=ndbdev@stripped/bzrroot/server/
+target=SunOS_5.10_sparc
+
+configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-ndb-ccflags="-g -DERROR_INSERT"'
+#configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-debug=full --with-ndb-ccflags="-g -DERROR_INSERT"'
+
+NDB_EXTRA_FLAGS="-g -DERROR_INSERT -DACC_SAFE_QUEUE"
+export NDB_EXTRA_FLAGS
+NDB_AUTOTEST_CONFIGURE_OPTIONS='--disable-assembler'
+export NDB_AUTOTEST_CONFIGURE_OPTIONS
+
+####################
+### Updated Path ###
+####################
+
+#PATH=/usr/local/bin:$PATH
+### Adding this version of perl to the path as it supports some more modules that are needed
+PATH=/opt/csw/bin:/usr/local/bin:$PATH
+
+##################
+### BK Options ###
+##################
+
+BK_LICENSE=ACCEPTED
+
+#############
+### Rsync ###
+#############
+
+RSYNC_RSH=ssh
+
+##############
+### Export ###
+##############
+
+export BK_LICENSE
+export DATE HOST
+INSTALL_INCLUDE_DIR=$INSTALL_DIR/include/mysql
+export INSTALL_INCLUDE_DIR
+NDB_CONNECTSTRING=$NDB_MASTER:$NDB_MASTER_PORT
+export NDB_CONNECTSTRING
+export NDB_EXTRA_FLAGS
+export PATH
+export RSYNC_RSH
+
+################
+## SHORT CUTS ##
+################
+
+alias ndb_cpcc="$INSTALL_BIN_DIR/ndb_cpcc"
+MYSQL_MASTER() { $MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT; }
+MYSQL_SLAVE() { $MYSQL -u root --protocol=tcp --port=$SLAVE_PORT --host=$SLAVE; }
+#alias MYSQL_MASTER='$MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT'
+#alias MYSQL_SLAVE='$MYSQL -u root --protocol=tcp --port=$SLAVE_PORT --host=$SLAVE'
+alias mgm_master='$NDB_MGM -c $NDB_MASTER:$NDB_MASTER_PORT'
+alias mgm_slave='$NDB_MGM -c $SLAVE:$NDB_SLAVE_PORT'
+alias mysql_config='$MYSQL_CONF'
+
+#MYSQL_MASTER="$MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT"
+#export MYSQL_MASTER
+
+echo "*****************************************************************"
+echo "****************** Config File END ******************************"
+echo "*****************************************************************"
+
+################
+# RDB EXPANDED #
+################
+RESULTS_REPORT="${PERL} ${RESULTS_DB_REPORT} -rDBh ${RDBHOST} -rDBn ${RDB}"
+RESULTS_REPORT="${RESULTS_REPORT} -rDBu=${RDBUSER} -rDBpa=${RDBPASS} -rDBpo ${RDBPORT}"
+RESULTS_REPORT="${RESULTS_REPORT} -c ${CLONE_REVISION_LOG} -em ${EMAIL_LIST}"
+
+UPDATE_RDB="${PERL} ${RESULTS_DB_UPDATE} -rDBh ${RDBHOST}"
+UPDATE_RDB="${UPDATE_RDB} -rDBu ${RDBUSER} -rDBpa ${RDBPASS} -rDBpo ${RDBPORT}"
+UPDATE_RDB="${UPDATE_RDB} -rDBn ${RDB} -clone ${CLONE_REVISION_LOG}"
+
+INIT_RDB="${PERL} ${RESULTS_DB_INIT} -cl ${CLONE_REVISION_LOG}"
+INIT_RDB="${INIT_RDB} -rDBh ${RDBHOST} -rDBu ${RDBUSER} -rDBpa ${RDBPASS} -rDBn ${RDB}"
+INIT_RDB="${INIT_RDB} -rDBpo ${RDBPORT}"
+
+EMAIL_ACRT_REPORT="${PERL} ${ACRT_REPORTING_TOOL} -re $REPORT_RESULTS"
+EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -cr ${REPORT_LOG} -cl ${CLONE_REVISION_LOG}"
+EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -em ${EMAIL_LIST}"
+
+#################
+# TIMER EXPANDED#
+#################
+OPS_TIMER="${PERL} $TIMER -ti $TIMER_LOG -tmp $TIMER_TMP"
+
+echo "*****************************************************************"
+echo "****************** Config File END ******************************"
+echo "*****************************************************************"
+
=== modified file 'autotest-os-conf-hold/cr-autotest.conf.fimafeng08'
--- a/autotest-os-conf-hold/cr-autotest.conf.fimafeng08 2008-11-03 05:51:16 +0000
+++ b/autotest-os-conf-hold/cr-autotest.conf.fimafeng08 2009-02-13 21:08:34 +0000
@@ -41,7 +41,7 @@ DRIVER=fimafeng08
### MySQLD ###
##############
-MASTER=fimafeng08
+MASTER=$DRIVER
MASTER_PORT=15001
SLAVE=tyr16
SLAVE_PORT=15003
@@ -54,6 +54,9 @@ NDB_MASTER=fimafeng08
NDB_MASTER_PORT=15000
NDB_SLAVE=tyr16
NDB_SLAVE_PORT=15002
+# Added by Jeb 2009/02/05
+NDB_MASTER_NODE_2=tyr17
+NDB_SLAVE_NODE2=tyr18
##################
### Misc Items ###
@@ -91,7 +94,6 @@ RUNNER=$SCRIPTS/run_test.sh
CLEANER=$SCRIPTS/cleanup.sh
BOOT_SH=$SCRIPTS/boot.sh
QUE_CLONE_FILE=$SCRIPTS/clones.sh
-IN_QUE=$MAIN_TEST_DIR/in-queue.txt
STARTER=$SCRIPTS/starter.sh
## TOOLS
@@ -111,6 +113,8 @@ RESET_MASTER=$TEST_TOOLS_DIR/ResetMaster
RESULTS_DB_UPDATE=$TEST_TOOLS_DIR/resultsDBupdate.pl
RESULTS_DB_REPORT=$TEST_TOOLS_DIR/resultsDBreport.pl
ACRT_REPORTING_TOOL=$TEST_TOOLS_DIR/sendTestResults.pl
+# Added by Jeb 2009/02/05
+TIMER=$TEST_TOOLS_DIR/timer.pl
##Changed perl version as this include more modules:
PERL=/opt/csw/bin/perl
@@ -124,11 +128,15 @@ REPORT_LOG=cr-report.txt
QUE_ERROR_LOG=$MAIN_TEST_DIR/queue_error.log
QUE_ADD_FILE=$MAIN_TEST_DIR/add-queue.txt
CLONE_REVISION_LOG=$TESTCASE_LOG_DIR/clone-revision.log
+IN_QUE=$MAIN_TEST_DIR/in-queue.txt
+
#Added by Jeb 2008/10/28
EMAIL_LIST=$TEST_TOOLS_DIR/mail.list
REPORT_RESULTS=$TESTCASE_LOG_DIR/acrt-results.rp
-
+# Added by Jeb 2009/02/05
+TIMER_LOG=$TESTCASE_LOG_DIR/test-ops-times.csv
+TIMER_TMP=$TEST_TMP_DIR/test.timer
##BIN
MYSQL=$INSTALL_BIN_DIR/mysql
@@ -162,7 +170,8 @@ RESULT_PATH="/bugs/acrt-results"
## RESULTS DB ##
################
RDBUSER=bmuser
-RDBPASS=bmpass
+# Changed by Jeb 2009/02/05
+RDBPASS=telco64
RDBHOST=ndbmaster
RDBPORT=3306
RDB=bm
@@ -251,6 +260,10 @@ EMAIL_ACRT_REPORT="${PERL} ${ACRT_REPORT
EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -cr ${REPORT_LOG} -cl ${CLONE_REVISION_LOG}"
EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -em ${EMAIL_LIST}"
+#################
+# TIMER EXPANDED#
+#################
+OPS_TIMER="${PERL} $TIMER -ti $TIMER_LOG -tmp $TIMER_TMP"
echo "*****************************************************************"
echo "****************** Config File END ******************************"
=== modified file 'autotest-os-conf-hold/cr-autotest.conf.ndb13'
--- a/autotest-os-conf-hold/cr-autotest.conf.ndb13 2008-11-03 05:51:16 +0000
+++ b/autotest-os-conf-hold/cr-autotest.conf.ndb13 2009-02-13 21:08:34 +0000
@@ -50,9 +50,11 @@ SLAVE_PORT=15003
### Cluster ####
################
-NDB_MASTER=ndb13
+NDB_MASTER=$SLAVE
+NDB_MASTER_NODE_2=$DRIVER
NDB_MASTER_PORT=15000
NDB_SLAVE=$SLAVE
+NDB_SLAVE_NODE2=$SLAVE
NDB_SLAVE_PORT=15002
##################
@@ -62,7 +64,7 @@ NDB_SLAVE_PORT=15002
DATE=`date '+%Y-%m-%d'`
DATE2=`date '+%Y-%m-%d_%H:%M'`
HOST=`hostname -s`
-HOSTS="$DRIVER $MASTER $SLAVE"
+HOSTS="$MASTER $SLAVE"
NEED_HOSTS=2
export INSTALL_LIB_DIR=$INSTALL_DIR/lib/mysql
export LD_LIBRARY_PATH=$INSTALL_LIB_DIR
@@ -103,6 +105,7 @@ RESET_MASTER=$TEST_TOOLS_DIR/ResetMaster
ACRT_REPORTING_TOOL=$TEST_TOOLS_DIR/sendTestResults.pl
PERL="/usr/bin/perl -w"
export PERL
+TIMER=$TEST_TOOLS_DIR/timer.pl
## MISC LOGS
@@ -110,9 +113,11 @@ ATRT_LOG=$MAIN_TEST_DIR/cr-acrt.log
RUNLOG=$MAIN_TEST_DIR/acrt-cron-log.txt
REPORT_LOG=cr-report.txt
QUE_ERROR_LOG=$MAIN_TEST_DIR/queue_error.log
-IN_QUE=$MAIN_TEST_DIR/in-queue.txt
QUE_ADD_FILE=$MAIN_TEST_DIR/add-queue.txt
+IN_QUE=$MAIN_TEST_DIR/in-queue.txt
CLONE_REVISION_LOG=$TESTCASE_LOG_DIR/clone-revision.log
+TIMER_LOG=$TESTCASE_LOG_DIR/test-ops-times.csv
+TIMER_TMP=$TEST_TMP_DIR/test.timer
##BIN
@@ -134,25 +139,25 @@ QUE_ADD_FILE=$MAIN_TEST_DIR/add-queue.tx
EMAIL_LIST=$TEST_TOOLS_DIR/mail.list
REPORT_RESULTS=$TESTCASE_LOG_DIR/acrt-results.rpt
-###############
-### Results ###
-###############
+####################
+### Results HOST ###
+####################
-POST_RESULTS=""
+POST_RESULTS="yes"
POST_TAR=""
UPDATE_BM_DATABASE=""
-DO_REV_FILE="yes"
+DO_REV_FILE=""
SUMMARY_REPORT=""
RESULT_HOST=ndb13.mysql.com
-RESULT_PATH="/data2/acrt-results"
+RESULT_PATH="/data2"
################
## RESULTS DB ##
################
RDBUSER=bmuser
-RDBPASS=bmpass
-RDBHOST=ndb15
+RDBPASS=telco64
+RDBHOST=ndbmaster
RDBPORT=3306
RDB=bm
@@ -202,9 +207,11 @@ export RSYNC_RSH
## SHORT CUTS ##
################
-alias ndb_cpcc="$INSTALL_BIN_DIR/ndb_cpcc"
-alias MYSQL_MASTER='$MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT'
-alias MYSQL_SLAVE='$MYSQL -u root --protocol=tcp --port=$SLAVE_PORT --host=$SLAVE'
+alias ndb_cpcc='$INSTALL_BIN_DIR/ndb_cpcc'
+MYSQL_MASTER="$MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT"
+MYSQL_SLAVE="$MYSQL -u root --protocol=tcp --port=$SLAVE_PORT --host=$SLAVE"
+export MYSQL_MASTER
+export MYSQL_SLAVE
alias mgm_master='$NDB_MGM -c $NDB_MASTER:$NDB_MASTER_PORT'
alias mgm_slave='$NDB_MGM -c $SLAVE:$NDB_SLAVE_PORT'
alias mysql_config='$MYSQL_CONF'
@@ -231,3 +238,9 @@ INIT_RDB="${INIT_RDB} -rDBpo ${RDBPORT}"
EMAIL_ACRT_REPORT="${PERL} ${ACRT_REPORTING_TOOL} -re $REPORT_RESULTS"
EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -cr ${REPORT_LOG} -cl ${CLONE_REVISION_LOG}"
EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -em ${EMAIL_LIST}"
+
+#################
+# TIMER EXPANDED#
+#################
+OPS_TIMER="${PERL} $TIMER -ti $TIMER_LOG -tmp $TIMER_TMP"
+
=== modified file 'autotest-os-conf-hold/cr-autotest.conf.ndb18'
--- a/autotest-os-conf-hold/cr-autotest.conf.ndb18 2008-10-30 23:41:52 +0000
+++ b/autotest-os-conf-hold/cr-autotest.conf.ndb18 2009-02-13 21:08:34 +0000
@@ -103,6 +103,7 @@ START_SLAVE=$TEST_TOOLS_DIR/StartSlave.s
RESET_SLAVE=$TEST_TOOLS_DIR/ResetSlave.sql
RESET_MASTER=$TEST_TOOLS_DIR/ResetMaster.sql
ACRT_REPORTING_TOOL=$TEST_TOOLS_DIR/sendTestResults.pl
+TIMER=$TEST_TOOLS_DIR/timer.pl
PERL="/usr/bin/perl -w"
export PERL
@@ -135,6 +136,8 @@ NDB_3_FS=/data2/ndb_3_fs
QUE_ADD_FILE=$MAIN_TEST_DIR/add-queue.txt
EMAIL_LIST=$TEST_TOOLS_DIR/mail.list
REPORT_RESULTS=$TESTCASE_LOG_DIR/acrt-results.rpt
+TIMER_LOG=$TESTCASE_LOG_DIR/test-ops-times.csv
+TIMER_TMP=$TEST_TMP_DIR/test.timer
####################
### Results HOST ###
@@ -153,7 +156,7 @@ RESULT_PATH="/bugs/acrt-results"
## RESULTS DB ##
################
RDBUSER=bmuser
-RDBPASS=bmpass
+RDBPASS=telco64
RDBHOST=ndbmaster
RDBPORT=3306
RDB=bm
@@ -166,8 +169,8 @@ RDB=bm
BZR_CLONE_BASE=ndbdev@stripped/bzrroot/server/
target=x86_64-unknown-linux-gnu
-configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-ndb-ccflags="-g -DERROR_INSERT"'
-#configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-debug=full --with-ndb-ccflags="-g -DERROR_INSERT"'
+#configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-ndb-ccflags="-g -DERROR_INSERT"'
+configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-debug=full --with-ndb-ccflags="-g -DERROR_INSERT"'
NDB_EXTRA_FLAGS="-g -DERROR_INSERT -DACC_SAFE_QUEUE"
####################
@@ -204,9 +207,11 @@ export RSYNC_RSH
## SHORT CUTS ##
################
-alias ndb_cpcc="$INSTALL_BIN_DIR/ndb_cpcc"
-alias mysql_master='$MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT'
-alias mysql_slave='$MYSQL -u root --protocol=tcp --port=$SLAVE_PORT --host=$SLAVE'
+alias ndb_cpcc='$INSTALL_BIN_DIR/ndb_cpcc'
+MYSQL_MASTER="$MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT"
+MYSQL_SLAVE="$MYSQL -u root --protocol=tcp --port=$SLAVE_PORT --host=$SLAVE"
+export MYSQL_MASTER
+export MYSQL_SLAVE
alias mgm_master='$NDB_MGM -c $NDB_MASTER:$NDB_MASTER_PORT'
alias mgm_slave='$NDB_MGM -c $SLAVE:$NDB_SLAVE_PORT'
alias mysql_config='$MYSQL_CONF'
@@ -233,3 +238,8 @@ INIT_RDB="${INIT_RDB} -rDBpo ${RDBPORT}"
EMAIL_ACRT_REPORT="${PERL} ${ACRT_REPORTING_TOOL} -re $REPORT_RESULTS"
EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -cr ${REPORT_LOG} -cl ${CLONE_REVISION_LOG}"
EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -em ${EMAIL_LIST}"
+
+#################
+# TIMER EXPANDED#
+#################
+OPS_TIMER="${PERL} $TIMER -ti $TIMER_LOG -tmp $TIMER_TMP"
=== modified file 'back_it.sh'
--- a/back_it.sh 2008-12-17 15:05:57 +0000
+++ b/back_it.sh 2009-02-13 21:08:34 +0000
@@ -3,4 +3,4 @@
set -e
rsync -a /space/cluster_rep_auto ndb15:/space/jmiller
-scp -r /space/cluster_rep_auto ndb13:/space/jmiller
+rsync -a /space/cluster_rep_auto ndb13:/space/jmiller
=== added file 'configurations/linux.ndb18/2-dn-atomics.cnf'
--- a/configurations/linux.ndb18/2-dn-atomics.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/2-dn-atomics.cnf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,53 @@
+[atrt]
+basedir=CHOOSE_dir
+baseport=15000
+clusters= .master
+
+[ndb_mgmd]
+
+[mysqld]
+skip-grant-tables
+skip-innodb
+ndb_use_exact_count=0
+loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=4
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+loose-ndb_cache_check_time=0
+
+[cluster_config]
+MaxNoOfSavedMessages = 30
+SendBufferMemory = 2M
+SharedGlobalMemory=384M
+NoOfReplicas = 2
+DataMemory = 9000M
+IndexMemory = 900M
+RedoBuffer=200M
+NoOfFragmentLogFiles=10
+FragmentLogFileSize=512M
+MaxNoOfConcurrentOperations = 250000
+MaxNoOfLocalOperations = 275000
+MaxNoOfConcurrentIndexOperations = 20000
+MaxNoOfAttributes=2048
+MaxNoOfOrderedIndexes=512
+MaxNoOfUniqueHashIndexes=512
+DiskPageBufferMemory=300MB
+LockPagesInMainMemory=1
+DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+
+[cluster_config.master]
+ndb_mgmd = CHOOSE_host2
+ndbd = CHOOSE_host2,CHOOSE_host3
+mysqld = CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
+
+[cluster_config.ndbd.1.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.master]
+FileSystemPath=/data1/
+
+
=== added file 'configurations/linux.ndb18/2-dn-func.cnf'
--- a/configurations/linux.ndb18/2-dn-func.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/2-dn-func.cnf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,55 @@
+[atrt]
+basedir=CHOOSE_dir
+baseport=15000
+clusters= .master
+
+[ndb_mgmd]
+
+[mysqld]
+skip-grant-tables
+skip-innodb
+ndb_use_exact_count=0
+loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
+
+[cluster_config]
+MaxNoOfSavedMessages = 30
+NoOfReplicas = 2
+DataMemory = 4000M
+IndexMemory = 400M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
+RedoBuffer=200M
+NoOfFragmentLogFiles=10
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+SharedGlobalMemory=384M
+SendBufferMemory = 2M
+MaxNoOfConcurrentOperations = 250000
+MaxNoOfLocalOperations = 275000
+MaxNoOfConcurrentIndexOperations = 20000
+MaxNoOfAttributes=2048
+MaxNoOfOrderedIndexes=512
+MaxNoOfUniqueHashIndexes=512
+MaxNoOfTables=800
+LockPagesInMainMemory=1
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+
+[cluster_config.master]
+ndb_mgmd = CHOOSE_host2
+ndbd = CHOOSE_host2,CHOOSE_host3
+mysqld = CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
+
+[cluster_config.ndbd.1.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.master]
+FileSystemPath=/data1/
+
+
=== added file 'configurations/linux.ndb18/2-dn-tpcb.cnf'
--- a/configurations/linux.ndb18/2-dn-tpcb.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/2-dn-tpcb.cnf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,56 @@
+[atrt]
+basedir=CHOOSE_dir
+baseport=15000
+clusters= .master
+
+[ndb_mgmd]
+
+[mysqld]
+skip-grant-tables
+skip-innodb
+ndb_use_exact_count=0
+loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=4
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+loose-ndb_cache_check_time=1
+debug=g
+
+[cluster_config]
+MaxNoOfSavedMessages = 30
+SendBufferMemory = 2M
+SharedGlobalMemory=384M
+NoOfReplicas = 2
+DataMemory = 9000M
+IndexMemory = 900M
+RedoBuffer=200M
+NoOfFragmentLogFiles=10
+FragmentLogFileSize=512M
+ODirect= 1
+#ThreadPool=1
+MaxNoOfConcurrentOperations = 250000
+MaxNoOfLocalOperations = 275000
+MaxNoOfConcurrentIndexOperations = 20000
+MaxNoOfAttributes=2048
+MaxNoOfOrderedIndexes=512
+MaxNoOfUniqueHashIndexes=512
+DiskPageBufferMemory=300MB
+LockPagesInMainMemory=1
+DiskCheckpointSpeed=16M
+#MemReportFrequency=200
+#LogLevelCongestion=15
+#LogLevelStatistic=15
+
+[cluster_config.master]
+ndb_mgmd = CHOOSE_host2
+ndbd = CHOOSE_host2,CHOOSE_host3
+mysqld = CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
+
+[cluster_config.ndbd.1.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.master]
+FileSystemPath=/data1/
+
+
=== added file 'configurations/linux.ndb18/conf-2-dn-dd.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-dd.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-dd.cnf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,56 @@
+[atrt]
+basedir=CHOOSE_dir
+baseport=15000
+clusters= .master
+
+[ndb_mgmd]
+
+[mysqld]
+skip-grant-tables
+skip-innodb
+ndb_use_exact_count=0
+loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=2
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
+
+
+[cluster_config]
+ThreadPool=10
+MaxNoOfSavedMessages = 1000
+SendBufferMemory = 2M
+SharedGlobalMemory=384M
+NoOfReplicas = 2
+DataMemory = 9000M
+IndexMemory = 900M
+RedoBuffer=200M
+NoOfFragmentLogFiles=15
+FragmentLogFileSize=256M
+InitFragmentLogFiles=FULL
+MaxNoOfConcurrentOperations = 250000
+MaxNoOfLocalOperations = 275000
+MaxNoOfConcurrentIndexOperations = 20000
+MaxNoOfAttributes=2048
+MaxNoOfOrderedIndexes=512
+MaxNoOfUniqueHashIndexes=512
+DiskPageBufferMemory=300MB
+LockPagesInMainMemory=1
+DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+
+[cluster_config.master]
+ndb_mgmd = CHOOSE_host2
+ndbd = CHOOSE_host2,CHOOSE_host3
+mysqld = CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
+
+[cluster_config.ndbd.1.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.master]
+FileSystemPath=/data1/
+
+
=== removed file 'configurations/linux.ndb18/conf-2-dn-func.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-func.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-func.cnf 1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-[atrt]
-basedir=CHOOSE_dir
-baseport=15000
-clusters= .master
-
-[ndb_mgmd]
-
-[mysqld]
-skip-grant-tables
-skip-innodb
-ndb_use_exact_count=0
-loose-join_cache_level=6
-
-[cluster_config]
-MaxNoOfSavedMessages = 1000
-SendBufferMemory = 2M
-
-[cluster_config.master]
-NoOfReplicas = 2
-DataMemory = 4000M
-IndexMemory = 400M
-RedoBuffer=200M
-NoOfFragmentLogFiles=10
-FragmentLogFileSize=256M
-MaxNoOfConcurrentOperations = 250000
-MaxNoOfLocalOperations = 275000
-MaxNoOfConcurrentIndexOperations = 20000
-MaxNoOfAttributes=2048
-MaxNoOfOrderedIndexes=512
-MaxNoOfUniqueHashIndexes=512
-DiskPageBufferMemory=300MB
-LockPagesInMainMemory=1
-DiskCheckpointSpeed=16M
-
-ndb_mgmd = CHOOSE_host2
-ndbd = CHOOSE_host2,CHOOSE_host3
-mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
-
-[cluster_config.ndbd.1.master]
-FileSystemPath=/data1/
-
-[cluster_config.ndbd.2.master]
-FileSystemPath=/data1/
-
-
=== modified file 'configurations/linux.ndb18/conf-2-dn-mt-6.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-mt-6.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-mt-6.cnf 2009-02-13 21:08:34 +0000
@@ -11,33 +11,45 @@ skip-grant-tables
skip-innodb
ndb_use_exact_count=0
loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
[cluster_config]
-MaxNoOfSavedMessages = 1000
-
-[cluster_config.master]
MaxNoOfExecutionThreads=6
+MaxNoOfSavedMessages = 30
NoOfReplicas = 2
DataMemory = 8000M
IndexMemory = 1000M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
RedoBuffer=200M
+TimeBetweenEpochsTimeout=6000
+NoOfFragmentLogFiles=15
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
+SharedGlobalMemory=384M
SendBufferMemory = 2M
-NoOfFragmentLogFiles=10
-FragmentLogFileSize=256M
+MaxNoOfExecutionThreads=6
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
MaxNoOfAttributes=2048
MaxNoOfOrderedIndexes=512
MaxNoOfUniqueHashIndexes=512
-DiskPageBufferMemory=250MB
LockPagesInMainMemory=1
-DiskCheckpointSpeed=16M
+MemReportFrequency=250
+LogLevelCongestion=15
+LogLevelStatistic=15
+[cluster_config.master]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.master]
FileSystemPath=/data1/
=== modified file 'configurations/linux.ndb18/conf-2-dn-mt-8-mixed.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-mt-8-mixed.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-mt-8-mixed.cnf 2009-02-13 21:08:34 +0000
@@ -11,33 +11,44 @@ skip-grant-tables
skip-innodb
ndb_use_exact_count=0
loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
[cluster_config]
-MaxNoOfSavedMessages = 1000
-
-[cluster_config.master]
MaxNoOfExecutionThreads=8
+MaxNoOfSavedMessages = 30
NoOfReplicas = 2
DataMemory = 8000M
IndexMemory = 1000M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
RedoBuffer=200M
-SendBufferMemory = 2M
NoOfFragmentLogFiles=10
-FragmentLogFileSize=256M
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
+TimeBetweenEpochsTimeout=6000
+SharedGlobalMemory=384M
+SendBufferMemory = 2M
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
MaxNoOfAttributes=2048
MaxNoOfOrderedIndexes=512
MaxNoOfUniqueHashIndexes=512
-DiskPageBufferMemory=250MB
LockPagesInMainMemory=1
-DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+[cluster_config.master]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.master]
FileSystemPath=/data1/
=== modified file 'configurations/linux.ndb18/conf-2-dn-mt-8.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-mt-8.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-mt-8.cnf 2009-02-13 21:08:34 +0000
@@ -11,33 +11,45 @@ skip-grant-tables
skip-innodb
ndb_use_exact_count=0
loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
[cluster_config]
-MaxNoOfSavedMessages = 1000
-
-[cluster_config.master]
MaxNoOfExecutionThreads=8
+MaxNoOfSavedMessages = 30
NoOfReplicas = 2
DataMemory = 8000M
IndexMemory = 1000M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
RedoBuffer=200M
+NoOfFragmentLogFiles=15
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+TimeBetweenEpochsTimeout=6000
+SharedGlobalMemory=384M
+ODirect= 1
+#ThreadPool=1
SendBufferMemory = 2M
-NoOfFragmentLogFiles=10
-FragmentLogFileSize=256M
+MaxNoOfExecutionThreads=6
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
MaxNoOfAttributes=2048
MaxNoOfOrderedIndexes=512
MaxNoOfUniqueHashIndexes=512
-DiskPageBufferMemory=250MB
LockPagesInMainMemory=1
-DiskCheckpointSpeed=16M
+MemReportFrequency=250
+LogLevelCongestion=15
+LogLevelStatistic=15
+[cluster_config.master]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.master]
FileSystemPath=/data1/
=== modified file 'configurations/linux.ndb18/conf-2-dn-mt.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-mt.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-mt.cnf 2009-02-13 21:08:34 +0000
@@ -11,33 +11,43 @@ skip-grant-tables
skip-innodb
ndb_use_exact_count=0
loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
[cluster_config]
-MaxNoOfSavedMessages = 1000
-
-[cluster_config.master]
MaxNoOfExecutionThreads=3
+MaxNoOfSavedMessages = 30
NoOfReplicas = 2
DataMemory = 8000M
IndexMemory = 1000M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
RedoBuffer=200M
-SendBufferMemory = 2M
NoOfFragmentLogFiles=10
-FragmentLogFileSize=256M
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
+SharedGlobalMemory=384M
+SendBufferMemory = 2M
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
MaxNoOfAttributes=2048
MaxNoOfOrderedIndexes=512
MaxNoOfUniqueHashIndexes=512
-DiskPageBufferMemory=250MB
LockPagesInMainMemory=1
-DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+[cluster_config.master]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.master]
FileSystemPath=/data1/
=== modified file 'configurations/linux.ndb18/conf-2-dn-old.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-old.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-old.cnf 2009-02-13 21:08:34 +0000
@@ -10,16 +10,18 @@ skip-grant-tables
skip-innodb
ndb_use_exact_count=0
loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
[cluster_config]
MaxNoOfSavedMessages = 1000
SendBufferMemory = 2M
-
-[cluster_config.master]
NoOfReplicas = 2
DataMemory = 4000M
IndexMemory = 400M
-RedoBuffer=200M
+RedoBuffer=300M
NoOfFragmentLogFiles=10
FragmentLogFileSize=256M
MaxNoOfConcurrentOperations = 250000
@@ -31,11 +33,15 @@ MaxNoOfUniqueHashIndexes=512
DiskPageBufferMemory=300MB
LockPagesInMainMemory=1
DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+[cluster_config.master]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.master]
FileSystemPath=/data1/
=== modified file 'configurations/linux.ndb18/conf-2-dn-perf.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-perf.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-perf.cnf 2009-02-13 21:08:34 +0000
@@ -10,18 +10,23 @@ skip-grant-tables
skip-innodb
ndb_use_exact_count=0
loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=4
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+loose-ndb_cache_check_time=1000
[cluster_config]
-MaxNoOfSavedMessages = 1000
+MaxNoOfSavedMessages = 30
SendBufferMemory = 2M
-
-[cluster_config.master]
+SharedGlobalMemory=384M
NoOfReplicas = 2
-DataMemory = 4000M
-IndexMemory = 400M
-RedoBuffer=200M
+DataMemory = 9000M
+IndexMemory = 900M
+RedoBuffer=400M
NoOfFragmentLogFiles=10
-FragmentLogFileSize=256M
+FragmentLogFileSize=512M
+ODirect= 1
+#ThreadPool=1
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
@@ -31,11 +36,15 @@ MaxNoOfUniqueHashIndexes=512
DiskPageBufferMemory=300MB
LockPagesInMainMemory=1
DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+[cluster_config.master]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.master]
FileSystemPath=/data1/
=== modified file 'configurations/linux.ndb18/conf-2-dn.cnf'
--- a/configurations/linux.ndb18/conf-2-dn.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-2-dn.cnf 2009-02-13 21:08:34 +0000
@@ -14,6 +14,7 @@ loose-join_cache_level=6
[cluster_config]
MaxNoOfSavedMessages = 1000
SendBufferMemory = 2M
+SharedGlobalMemory=384M
[cluster_config.master]
NoOfReplicas = 2
=== added file 'configurations/linux.ndb18/conf-4-dn-func.cnf'
--- a/configurations/linux.ndb18/conf-4-dn-func.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/conf-4-dn-func.cnf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,59 @@
+[atrt]
+basedir=CHOOSE_dir
+baseport=15000
+clusters= .master
+
+[ndb_mgmd]
+
+[mysqld]
+skip-grant-tables
+skip-innodb
+ndb_use_exact_count=0
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
+
+[cluster_config]
+MaxNoOfSavedMessages = 30
+NoOfReplicas = 2
+DataMemory = 7000M
+IndexMemory = 700M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
+RedoBuffer=200M
+NoOfFragmentLogFiles=10
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+SharedGlobalMemory=384M
+SendBufferMemory = 2M
+MaxNoOfConcurrentOperations = 250000
+MaxNoOfLocalOperations = 275000
+MaxNoOfConcurrentIndexOperations = 20000
+MaxNoOfAttributes=2048
+MaxNoOfOrderedIndexes=512
+MaxNoOfUniqueHashIndexes=512
+MaxNoOfTables=300
+LockPagesInMainMemory=1
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+
+[cluster_config.master]
+ndb_mgmd = CHOOSE_host2
+ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host4,CHOOSE_host5
+mysqld = CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
+
+[cluster_config.ndbd.1.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.3.master]
+FileSystemPath=/data2/
+
+[cluster_config.ndbd.4.master]
+FileSystemPath=/data2/
+
=== modified file 'configurations/linux.ndb18/conf-4-dn-mt-6.cnf'
--- a/configurations/linux.ndb18/conf-4-dn-mt-6.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-4-dn-mt-6.cnf 2009-02-13 21:08:34 +0000
@@ -11,33 +11,46 @@ skip-grant-tables
skip-innodb
ndb_use_exact_count=0
loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
[cluster_config]
-MaxNoOfSavedMessages = 1000
-
-[cluster_config.multi]
MaxNoOfExecutionThreads=6
+MaxNoOfSavedMessages = 30
+SharedGlobalMemory=384M
NoOfReplicas = 2
-DataMemory = 6500M
+DataMemory = 7000M
IndexMemory = 800M
RedoBuffer=200M
SendBufferMemory = 2M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
NoOfFragmentLogFiles=10
-FragmentLogFileSize=256M
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
+TimeBetweenEpochsTimeout=6000
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
MaxNoOfAttributes=2048
MaxNoOfOrderedIndexes=512
MaxNoOfUniqueHashIndexes=512
-DiskPageBufferMemory=64MB
LockPagesInMainMemory=1
DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+
+[cluster_config.multi]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.multi]
FileSystemPath=/data1/
=== added file 'configurations/linux.ndb18/conf-4-dn-mt-8-mixed.cnf'
--- a/configurations/linux.ndb18/conf-4-dn-mt-8-mixed.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/conf-4-dn-mt-8-mixed.cnf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,66 @@
+[atrt]
+basedir=CHOOSE_dir
+baseport=15000
+clusters= .multi
+mt = 1
+
+[ndb_mgmd]
+
+[mysqld]
+skip-grant-tables
+skip-innodb
+ndb_use_exact_count=0
+loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
+
+[cluster_config]
+MaxNoOfExecutionThreads=8
+MaxNoOfSavedMessages = 30
+SharedGlobalMemory=384M
+NoOfReplicas = 2
+DataMemory = 7000M
+IndexMemory = 800M
+RedoBuffer=200M
+SendBufferMemory = 2M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
+NoOfFragmentLogFiles=10
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
+TimeBetweenEpochsTimeout=6000
+MaxNoOfConcurrentOperations = 250000
+MaxNoOfLocalOperations = 275000
+MaxNoOfConcurrentIndexOperations = 20000
+MaxNoOfAttributes=2048
+MaxNoOfOrderedIndexes=512
+MaxNoOfUniqueHashIndexes=512
+LockPagesInMainMemory=1
+DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+
+[cluster_config.multi]
+ndb_mgmd = CHOOSE_host2
+ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host2,CHOOSE_host3
+mysqld = CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
+
+[cluster_config.ndbd.1.multi]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.multi]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.3.multi]
+FileSystemPath=/data2/
+
+[cluster_config.ndbd.4.multi]
+FileSystemPath=/data2/
+
+
=== modified file 'configurations/linux.ndb18/conf-4-dn-mt-8.cnf'
--- a/configurations/linux.ndb18/conf-4-dn-mt-8.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-4-dn-mt-8.cnf 2009-02-13 21:08:34 +0000
@@ -11,33 +11,45 @@ skip-grant-tables
skip-innodb
ndb_use_exact_count=0
loose-join_cache_level=6
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
[cluster_config]
-MaxNoOfSavedMessages = 1000
-
-[cluster_config.multi]
MaxNoOfExecutionThreads=8
+MaxNoOfSavedMessages = 30
+SharedGlobalMemory=384M
NoOfReplicas = 2
-DataMemory = 6500M
+DataMemory = 7000M
IndexMemory = 800M
RedoBuffer=200M
SendBufferMemory = 2M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
NoOfFragmentLogFiles=10
-FragmentLogFileSize=256M
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
+TimeBetweenEpochsTimeout=6000
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
MaxNoOfAttributes=2048
MaxNoOfOrderedIndexes=512
MaxNoOfUniqueHashIndexes=512
-DiskPageBufferMemory=64MB
LockPagesInMainMemory=1
DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+[cluster_config.multi]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.multi]
FileSystemPath=/data1/
=== added file 'configurations/linux.ndb18/conf-4-dn-perf.cnf'
--- a/configurations/linux.ndb18/conf-4-dn-perf.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/conf-4-dn-perf.cnf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,62 @@
+[atrt]
+basedir=CHOOSE_dir
+baseport=15000
+clusters= .master
+
+[ndb_mgmd]
+
+[mysqld]
+skip-grant-tables
+skip-innodb
+ndb_use_exact_count=0
+loose-ndb-cluster-connection-pool=3
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
+
+[cluster_config]
+MaxNoOfSavedMessages = 30
+SharedGlobalMemory=384M
+NoOfReplicas = 2
+DataMemory = 7000M
+IndexMemory = 800M
+RedoBuffer=200M
+SendBufferMemory = 2M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
+NoOfFragmentLogFiles=10
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
+TimeBetweenEpochsTimeout=6000
+MaxNoOfConcurrentOperations = 250000
+MaxNoOfLocalOperations = 275000
+MaxNoOfConcurrentIndexOperations = 20000
+MaxNoOfAttributes=2048
+MaxNoOfOrderedIndexes=512
+MaxNoOfUniqueHashIndexes=512
+LockPagesInMainMemory=1
+DiskCheckpointSpeed=16M
+MemReportFrequency=200
+LogLevelCongestion=15
+LogLevelStatistic=15
+
+[cluster_config.master]
+ndb_mgmd = CHOOSE_host2
+ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host4,CHOOSE_host5
+mysqld = CHOOSE_host1
+ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
+
+[cluster_config.ndbd.1.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.3.master]
+FileSystemPath=/data2/
+
+[cluster_config.ndbd.4.master]
+FileSystemPath=/data2/
+
=== modified file 'configurations/linux.ndb18/conf-4-dn.cnf'
--- a/configurations/linux.ndb18/conf-4-dn.cnf 2008-10-29 21:41:06 +0000
+++ b/configurations/linux.ndb18/conf-4-dn.cnf 2009-02-13 21:08:34 +0000
@@ -12,6 +12,7 @@ ndb_use_exact_count=0
[cluster_config]
MaxNoOfSavedMessages = 1000
+SharedGlobalMemory=384M
[cluster_config.master]
NoOfReplicas = 2
=== added file 'configurations/linux.ndb18/conf-clst-rep-mt-mixed.cnf'
--- a/configurations/linux.ndb18/conf-clst-rep-mt-mixed.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/conf-clst-rep-mt-mixed.cnf 2009-02-13 21:08:34 +0000
@@ -0,0 +1,79 @@
+[atrt]
+basedir=CHOOSE_dir
+baseport=15000
+clusters= .master,.slave
+replicate= 1.master:1.slave
+mt = 1
+
+[ndb_mgmd]
+
+[mysqld]
+skip-grant-tables
+skip-innodb
+ndb_use_exact_count=0
+loose-ndb-cluster-connection-pool=2
+loose-ndb_extra_logging=9
+loose-engine_condition_pushdown=1
+#loose-ndb_cache_check_time=1000
+
+[mysqld.1.master]
+loose-log-bin
+loose-binlog-format=row
+
+[mysqld.1.slave]
+loose-slave-allow-batching
+
+[cluster_config]
+MaxNoOfExecutionThreads=4
+SendBufferMemory = 2M
+SharedGlobalMemory = 384M
+NoOfReplicas = 2
+DataMemory = 7000M
+IndexMemory = 700M
+MaxNoOfSavedMessages = 1000
+NoOfFragmentLogFiles=10
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
+MaxNoOfConcurrentOperations = 250000
+MaxNoOfLocalOperations = 275000
+MaxNoOfConcurrentIndexOperations = 20000
+MaxNoOfAttributes=4096
+MaxNoOfOrderedIndexes=1024
+MaxNoOfUniqueHashIndexes=1024
+LockPagesInMainMemory=1
+DiskPageBufferMemory=350MB
+DiskCheckpointSpeed=16M
+LogLevelStatistic=15
+LogLevelError=15
+LogLevelCongestion=15
+RedoBuffer=400M
+MemReportFrequency=200
+
+[cluster_config.master]
+ndb_mgmd = CHOOSE_host2
+ndbd = CHOOSE_host2,CHOOSE_host3
+mysqld = CHOOSE_host1
+ndbapi = CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
+
+[cluster_config.ndbd.1.master]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.master]
+FileSystemPath=/data2/
+
+[cluster_config.slave]
+ndb_mgmd = CHOOSE_host4
+ndbd = CHOOSE_host4,CHOOSE_host5
+mysqld = CHOOSE_host4
+ndbapi= CHOOSE_host4,CHOOSE_host4,CHOOSE_host1,CHOOSE_host4,CHOOSE_host4
+
+[cluster_config.ndbd.1.slave]
+FileSystemPath=/data1/
+
+[cluster_config.ndbd.2.slave]
+FileSystemPath=/data2/
+
+
+
=== modified file 'configurations/linux.ndb18/conf-clst-rep-strss.cnf'
--- a/configurations/linux.ndb18/conf-clst-rep-strss.cnf 2008-10-29 21:41:06 +0000
+++ b/configurations/linux.ndb18/conf-clst-rep-strss.cnf 2009-02-13 21:08:34 +0000
@@ -13,7 +13,7 @@ ndb_use_exact_count=0
loose-ndb-cluster-connection-pool=2
loose-ndb_extra_logging=9
loose-engine_condition_pushdown=1
-loose-ndb_cache_check_time=1000
+#loose-ndb_cache_check_time=1000
[mysqld.1.slave]
loose-slave-allow-batching
=== modified file 'configurations/linux.ndb18/conf-clst-rep.cnf'
--- a/configurations/linux.ndb18/conf-clst-rep.cnf 2008-12-15 22:13:26 +0000
+++ b/configurations/linux.ndb18/conf-clst-rep.cnf 2009-02-13 21:08:34 +0000
@@ -13,7 +13,7 @@ ndb_use_exact_count=0
loose-ndb-cluster-connection-pool=2
loose-ndb_extra_logging=9
loose-engine_condition_pushdown=1
-loose-ndb_cache_check_time=1000
+#loose-ndb_cache_check_time=1000
[mysqld.1.master]
loose-log-bin
@@ -22,32 +22,38 @@ loose-binlog-format=row
[mysqld.1.slave]
loose-slave-allow-batching
-
[cluster_config]
+SendBufferMemory = 2M
+SharedGlobalMemory = 384M
NoOfReplicas = 2
-DataMemory = 4000M
-IndexMemory = 400M
+DataMemory = 7000M
+IndexMemory = 700M
MaxNoOfSavedMessages = 1000
-NoOfFragmentLogFiles = 300
+NoOfFragmentLogFiles=10
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
+ODirect= 1
+#ThreadPool=1
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
MaxNoOfAttributes=4096
MaxNoOfOrderedIndexes=1024
MaxNoOfUniqueHashIndexes=1024
-DiskPageBufferMemory=128MB
LockPagesInMainMemory=1
+DiskPageBufferMemory=350MB
DiskCheckpointSpeed=16M
LogLevelStatistic=15
LogLevelError=15
LogLevelCongestion=15
+RedoBuffer=400M
+MemReportFrequency=200
[cluster_config.master]
-RedoBuffer=64M
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi = CHOOSE_host1,CHOOSE_host1
+ndbapi = CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.master]
FileSystemPath=/data1/
@@ -56,11 +62,10 @@ FileSystemPath=/data1/
FileSystemPath=/data2/
[cluster_config.slave]
-RedoBuffer=64M
ndb_mgmd = CHOOSE_host4
ndbd = CHOOSE_host4,CHOOSE_host5
mysqld = CHOOSE_host4
-ndbapi= CHOOSE_host4,CHOOSE_host4,CHOOSE_host1
+ndbapi= CHOOSE_host4,CHOOSE_host4,CHOOSE_host1,CHOOSE_host4,CHOOSE_host4
[cluster_config.ndbd.1.slave]
FileSystemPath=/data1/
=== modified file 'configurations/linux.ndb18/conf-stress.cnf'
--- a/configurations/linux.ndb18/conf-stress.cnf 2008-10-29 21:41:06 +0000
+++ b/configurations/linux.ndb18/conf-stress.cnf 2009-02-13 21:08:34 +0000
@@ -9,37 +9,41 @@ clusters= .master
skip-grant-tables
skip-innodb
ndb_use_exact_count=0
-loose-ndb-cluster-connection-pool=2
+loose-ndb-cluster-connection-pool=3
loose-ndb_extra_logging=9
loose-engine_condition_pushdown=1
-loose-ndb_cache_check_time=1000
-
-
+#loose-ndb_cache_check_time=1000
[cluster_config]
-MaxNoOfSavedMessages = 1000
+MaxNoOfSavedMessages = 30
+SharedGlobalMemory=384M
NoOfReplicas = 2
-DataMemory = 8000M
-IndexMemory = 1000M
-RedoBuffer=64M
-NoOfFragmentLogFiles = 300
+DataMemory = 9000M
+IndexMemory = 900M
+RedoBuffer=200M
+SendBufferMemory = 2M
+DiskPageBufferMemory=300MB
+DiskCheckpointSpeed=16M
+NoOfFragmentLogFiles=20
+FragmentLogFileSize=512M
+InitFragmentLogFiles=FULL
MaxNoOfConcurrentOperations = 250000
MaxNoOfLocalOperations = 275000
MaxNoOfConcurrentIndexOperations = 20000
-MaxNoOfAttributes=4096
-MaxNoOfOrderedIndexes=1024
-MaxNoOfUniqueHashIndexes=1024
-DiskPageBufferMemory=128MB
+MaxNoOfAttributes=2048
+MaxNoOfOrderedIndexes=512
+MaxNoOfUniqueHashIndexes=512
LockPagesInMainMemory=1
DiskCheckpointSpeed=16M
-LogLevelStatistic=15
-LogLevelError=15
+MemReportFrequency=200
LogLevelCongestion=15
+LogLevelStatistic=15
+[cluster_config.master]
ndb_mgmd = CHOOSE_host2
ndbd = CHOOSE_host2,CHOOSE_host3
mysqld = CHOOSE_host1
-ndbapi= CHOOSE_host1,CHOOSE_host1
+ndbapi = CHOOSE_host1,CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
[cluster_config.ndbd.1.master]
FileSystemPath=/data1/
=== modified file 'cr-autotest.conf'
--- a/cr-autotest.conf 2008-11-03 05:51:16 +0000
+++ b/cr-autotest.conf 2009-02-13 21:08:34 +0000
@@ -103,6 +103,7 @@ START_SLAVE=$TEST_TOOLS_DIR/StartSlave.s
RESET_SLAVE=$TEST_TOOLS_DIR/ResetSlave.sql
RESET_MASTER=$TEST_TOOLS_DIR/ResetMaster.sql
ACRT_REPORTING_TOOL=$TEST_TOOLS_DIR/sendTestResults.pl
+TIMER=$TEST_TOOLS_DIR/timer.pl
PERL="/usr/bin/perl -w"
export PERL
@@ -135,6 +136,8 @@ NDB_3_FS=/data2/ndb_3_fs
QUE_ADD_FILE=$MAIN_TEST_DIR/add-queue.txt
EMAIL_LIST=$TEST_TOOLS_DIR/mail.list
REPORT_RESULTS=$TESTCASE_LOG_DIR/acrt-results.rpt
+TIMER_LOG=$TESTCASE_LOG_DIR/test-ops-times.csv
+TIMER_TMP=$TEST_TMP_DIR/test.timer
####################
### Results HOST ###
@@ -153,7 +156,7 @@ RESULT_PATH="/bugs/acrt-results"
## RESULTS DB ##
################
RDBUSER=bmuser
-RDBPASS=bmpass
+RDBPASS=telco64
RDBHOST=ndbmaster
RDBPORT=3306
RDB=bm
@@ -166,8 +169,8 @@ RDB=bm
BZR_CLONE_BASE=ndbdev@stripped/bzrroot/server/
target=x86_64-unknown-linux-gnu
-configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-ndb-ccflags="-g -DERROR_INSERT"'
-#configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-debug=full --with-ndb-ccflags="-g -DERROR_INSERT"'
+#configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-ndb-ccflags="-g -DERROR_INSERT"'
+configure='CC=gcc CXX=gcc CFLAGS="-Wall -pedantic -Wno-long-long" CXXFLAGS="-Wall -pedantic -Wno-long-long -fno-exceptions -fno-rtti" ./configure --with-ndbcluster --with-row-based-replication --with-ndb-test --with-embedded-server --enable-thread-safe-client --with-debug=full --with-ndb-ccflags="-g -DERROR_INSERT"'
NDB_EXTRA_FLAGS="-g -DERROR_INSERT -DACC_SAFE_QUEUE"
####################
@@ -204,9 +207,11 @@ export RSYNC_RSH
## SHORT CUTS ##
################
-alias ndb_cpcc="$INSTALL_BIN_DIR/ndb_cpcc"
-alias MYSQL_MASTER='$MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT'
-alias MYSQL_SLAVE='$MYSQL -u root --protocol=tcp --port=$SLAVE_PORT --host=$SLAVE'
+alias ndb_cpcc='$INSTALL_BIN_DIR/ndb_cpcc'
+MYSQL_MASTER="$MYSQL --host=$MASTER -u root --protocol=tcp --port=$MASTER_PORT"
+MYSQL_SLAVE="$MYSQL -u root --protocol=tcp --port=$SLAVE_PORT --host=$SLAVE"
+export MYSQL_MASTER
+export MYSQL_SLAVE
alias mgm_master='$NDB_MGM -c $NDB_MASTER:$NDB_MASTER_PORT'
alias mgm_slave='$NDB_MGM -c $SLAVE:$NDB_SLAVE_PORT'
alias mysql_config='$MYSQL_CONF'
@@ -233,3 +238,8 @@ INIT_RDB="${INIT_RDB} -rDBpo ${RDBPORT}"
EMAIL_ACRT_REPORT="${PERL} ${ACRT_REPORTING_TOOL} -re $REPORT_RESULTS"
EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -cr ${REPORT_LOG} -cl ${CLONE_REVISION_LOG}"
EMAIL_ACRT_REPORT="${EMAIL_ACRT_REPORT} -em ${EMAIL_LIST}"
+
+#################
+# TIMER EXPANDED#
+#################
+OPS_TIMER="${PERL} $TIMER -ti $TIMER_LOG -tmp $TIMER_TMP"
=== modified file 'crontab.examples'
--- a/crontab.examples 2008-10-29 21:54:16 +0000
+++ b/crontab.examples 2009-02-13 21:08:34 +0000
@@ -1,11 +1,23 @@
-01 1 * * 6 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh clst-rep-strss mysql-5.1-telco-6.3 > /dev/null
-02 1 * * 1 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn > /space/crontab.log
+02 1 * * 1 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn-func > /space/crontab.log
+02 1 * * 1 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn-perf > /space/crontab.log
+02 1 * * 1 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.2 2-dn-old > /space/crontab.log
+02 1 * * 1 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-6.0-telco-6.2 2-dn-old > /space/crontab.log
01 1 * * 2 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf clst-rep > /space/crontab.log
-02 1 * * 3 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn > /space/crontab.log
-02 1 * * 4 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 4-dn > /space/crontab.log
-01 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn > /space/crontab.log
+02 1 * * 2 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn-perf > /space/crontab.log
+02 1 * * 2 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-6.0-ndb 2-dn-perf > /space/crontab.log
+02 1 * * 3 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn-perf > /space/crontab.log
+02 1 * * 3 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 4-dn-func > /space/crontab.log
+02 1 * * 4 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn-perf > /space/crontab.log
+02 1 * * 4 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 4-dn-perf > /space/crontab.log
02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 2-dn-mt > /space/crontab.log
02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 2-dn-mt-6 > /space/crontab.log
+02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 4-dn-mt-6 > /space/crontab.log
02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 2-dn-mt-8 > /space/crontab.log
-02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 stress > /space/crontab.log
+02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 2-dn-mt-8-mixed > /space/crontab.log
+02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 4-dn-mt-8 > /space/crontab.log
+02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 4-dn-mt-8-mixed > /space/crontab.log
+02 1 * * 5 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 clst-rep-mt-mixed > /space/crontab.log
+02 1 * * 6 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf 2-dn-perf > /space/crontab.log
+02 1 * * 6 /bin/sh /space/cluster_rep_auto/scripts/test_queuer.sh --conf=/space/cluster_rep_auto/cr-autotest.conf --clone=mysql-5.1-telco-6.4 stress > /space/crontab.log
+01 13 * * 1,4 /usr/bin/perl /space/ver_test_auto/rplautotest.pl --config=/space/ver_test_auto/rplautotest.cfg --no-copy
=== modified file 'drivers/add-online-tester.sh'
--- a/drivers/add-online-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/add-online-tester.sh 2009-02-13 21:08:34 +0000
@@ -49,49 +49,57 @@ RUN="$PERL $ADD_ONLINE_SCRIPT"
ARGS="--host=$MASTER --user=$USER --port=$MASTER_PORT"
ARGS2="--testdir=$AO_TEST_DIR --reportFile=$REPORT"
-
############################
# Run Tests
###########################
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
print_date(){
-echo ${LINE} >> ${LOGFILE}
-date >> ${LOGFILE}
-echo ${LINE} >> ${LOGFILE}
+ line
+ date >> ${LOGFILE}
+ line
}
run_test(){
-${RUN} ${ARGS} ${ARGS2}
-RC=$?
-if [ ${RC} -ne 0 ]
-then
- echo "Script -> Return code = ${RC}"
- echo "Script -> ${RUN} failed" >> ${LOGFILE}
- print_date
- failed
-fi
+ print_date
+ ${RUN} ${ARGS} ${ARGS2}
+ RC=$?
+ if [ ${RC} -ne 0 ];then
+ echo "Script -> Return code = ${RC}"
+ echo "Script -> ${RUN} failed" >> ${LOGFILE}
+ failed
+ fi
+ print_date
+ check_sub
}
-check_results(){
-COUNT=`grep -i error ${SUB_REPORT} |wc -l`
-if [ ${COUNT} -ne 0 ];then
- echo ${LINE} >> ${LOGFILE}
- echo "${SUB_REPORT} shows ${FAILURE}"
+check_sub(){
+ COUNT=`grep -i error ${SUB_REPORT} |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ line
+ echo "${SUB_REPORT} shows ${FAILURE}" >> ${LOGFILE}
+ print_date
+ failed
+ fi
+ line
+ print_date
+ echo "Script -> add online tests completed.... " >> ${LOGFILE}
+}
+
+header()
+{
print_date
- failed
-fi
+ echo "Script -> add-online-tester.sh is running..."
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> add-online-tester.sh is running..." > ${LOGFILE}
}
-echo "Script -> add-online-tester.sh is running..."
-echo "Script -> add-online-tester.sh is running..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
-echo ${LINE} >> ${LOGFILE}
-echo "Script -> Running add online tests.... " >> ${LOGFILE}
+########################## RUN TEST ##########################
+header
run_test
-check_results
-echo ${LINE} >> ${LOGFILE}
-echo "Script -> add online tests completed.... " >> ${LOGFILE}
-print_date
echo "NDBT_ProgramExit: OK"
exit 0
=== modified file 'drivers/cge-rep-tester.sh'
--- a/drivers/cge-rep-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/cge-rep-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,23 +1,23 @@
#!/bin/bash
-################################################################################
+#-------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#-------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#-------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#-------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#--------------
# Load Config
-#################
+#--------------
CONF=$1
if [ -f $CONF ]
then
@@ -28,9 +28,9 @@ if [ -f $CONF ]
exit 1
fi
-#########################
+#--------------
# Set Variables
-#########################
+#--------------
USER=root
LOGFILE=$TESTCASE_LOG_DIR/cge-rep.log
RESTORE_LOG=$TEST_TMP_DIR/cge-rep-restore.log
@@ -110,238 +110,292 @@ if [ `uname -s` != "SunOS" ]
trap failed HUP INT QUIT PIPE TERM
fi
+OPS_TIMER="$OPS_TIMER --testName=cge-rep-tester"
+
+#--------------------
+# Script Functions
+#--------------------
+
line(){
-echo ${LINE} >> ${LOGFILE}
+ echo ${LINE} >> ${LOGFILE}
}
print_date(){
-line
-date >> ${LOGFILE}
-line
+ line
+ date >> ${LOGFILE}
+ line
}
remove_data(){
-line
-echo "Script -> Removing Restore Files.." >> ${LOGFILE}
-if [ -d "${CGE_DATA}/sc" ] || [ -d "${CGE_DATA}/sony" ] ||
- [ -d "${CGE_DATA}/np" ] ;then
- cd ${CGE_DATA}
- rm -rf *
-fi
+ line
+ echo "Script -> Removing Restore Files.." >> ${LOGFILE}
+ if [ -d "${CGE_DATA}/sc" ] || [ -d "${CGE_DATA}/sony" ] ||
+ [ -d "${CGE_DATA}/np" ] ;then
+ cd ${CGE_DATA}
+ rm -rf *
+ fi
}
failed(){
-remove_data
-if [ -e ${RESTORE_LOG} ];then
- cat ${RESTORE_LOG} >> ${LOGFILE}
- rm ${RESTORE_LOG}
-fi
-if [ -e ${SQL_LOG} ];then
- cat ${SQL_LOG} >> ${LOGFILE}
- rm ${SQL_LOG}
-fi
-line
-echo "Script -> Error Trapped, script failed!" >> ${LOGFILE}
-print_date
-echo ${FAILURE}
-exit 1
+ remove_data
+ if [ -e ${RESTORE_LOG} ];then
+ cat ${RESTORE_LOG} >> ${LOGFILE}
+ rm ${RESTORE_LOG}
+ fi
+ if [ -e ${SQL_LOG} ];then
+ cat ${SQL_LOG} >> ${LOGFILE}
+ rm ${SQL_LOG}
+ fi
+ line
+ echo "Script -> Error Trapped, script failed!" >> ${LOGFILE}
+ print_date
+ echo ${FAILURE}
+ exit 1
}
check_sql(){
-cat ${SQL_LOG} >> ${LOGFILE}
-COUNT=`grep -i error $SQL_LOG |wc -l`
-if [ ${COUNT} -ne 0 ];then
+ cat ${SQL_LOG} >> ${LOGFILE}
+ COUNT=`grep -i error $SQL_LOG |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ rm ${SQL_LOG}
+ echo "Script -> SQL failed!" >> ${LOGFILE}
+ ${MYSQL_MASTER} -e "SHOW ERRORS;" >> ${LOGFILE} 2>&1
+ failed
+ fi
rm ${SQL_LOG}
- echo "Script -> SQL failed!" >> ${LOGFILE}
- failed
-fi
-rm ${SQL_LOG}
}
check_restore(){
-cat ${RESTORE_LOG} >> ${LOGFILE}
-COUNT=`grep -i fail ${RESTORE_LOG} |wc -l`
-if [ ${COUNT} -ne 0 ];then
+ cat ${RESTORE_LOG} >> ${LOGFILE}
+ COUNT=`grep -i fail ${RESTORE_LOG} |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ rm ${RESTORE_LOG}
+ echo "NDB RESTORE failed, trying SQL Dump!" >> ${LOGFILE}
+ return 1
+ fi
rm ${RESTORE_LOG}
- echo "NDB RESTORE failed, trying SQL Dump!" >> ${LOGFILE}
- return 1
-fi
-rm ${RESTORE_LOG}
-return 0
+ return 0
}
wait_for_sql_ready(){
-line
-echo "Script -> Calling Wait for SQL ready..." >> ${LOGFILE}
-${WFSQLR}
-RC=$?
-if [ ${RC} -ne 0 ];then
- echo "Script -> wait for sql ready failed" >> ${LOGFILE}
- failed
-fi
-echo "Script -> SQL HOSTS are ready..." >> ${LOGFILE}
+ line
+ echo "Script -> Calling Wait for SQL ready..." >> ${LOGFILE}
+ ${WFSQLR}
+ RC=$?
+ if [ ${RC} -ne 0 ];then
+ echo "Script -> wait for sql ready failed" >> ${LOGFILE}
+ failed
+ fi
+ echo "Script -> SQL HOSTS are ready..." >> ${LOGFILE}
}
data_extraction(){
-line
-echo "Script -> Extracting Data..." >> ${LOGFILE}
-${EXTRACT_DATA} ${CGE_DATA} >> ${LOGFILE}
-echo "Script -> Data Extracted..." >> ${LOGFILE}
+ line
+ echo "Script -> Extracting Data..." >> ${LOGFILE}
+ ${EXTRACT_DATA} ${CGE_DATA} >> ${LOGFILE}
+ echo "Script -> Data Extracted..." >> ${LOGFILE}
}
create_sc_db(){
-line
-echo "Script -> Creating sc Database.." >> ${LOGFILE}
-MYSQL_MASTER < ${SC_CREATE_DB} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> sc Database Created.." >> ${LOGFILE}
+ line
+ echo "Script -> Creating sc Database.." >> ${LOGFILE}
+ $OPS_TIMER --testOp="Create DB"
+ $MYSQL_MASTER < ${SC_CREATE_DB} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ echo "Script -> sc Database Created.." >> ${LOGFILE}
}
load_sc(){
-line
-echo "Script -> Calling Load for SC.." >> ${LOGFILE}
-${NDB_RESTORE} ${LOAD_SC_ARGS} >> ${RESTORE_LOG} 2>&1
-}
-
-run_sc(){
-echo "Script -> Starting SC Query Run" >> ${LOGFILE}
-for count in 1 2 3 4 5
-do
line
- echo "Script -> Calling SC Query #${count}" >> ${LOGFILE}
- if [ ${count} -eq 1 ];then
- ${CGE_RUN} ${SC_1} >> ${SC_REPORT}
- fi
- if [ ${count} -eq 2 ];then
- ${CGE_RUN} ${SC_2} >> ${SC_REPORT}
- fi
- if [ ${count} -eq 3 ];then
- ${CGE_RUN} ${SC_3} >> ${SC_REPORT}
+ echo "Script -> Calling Load for SC.." >> ${LOGFILE}
+ $OPS_TIMER --testOp="NDB Restore SC"
+ ${NDB_RESTORE} ${LOAD_SC_ARGS} >> ${RESTORE_LOG} 2>&1
+ $OPS_TIMER --end
+ check_restore
+ RC=$?
+ if [ ${RC} != 0 ];then
+ do_sql_load_sc
fi
- if [ ${count} -eq 4 ];then
- ${CGE_RUN} ${SC_4} >> ${SC_REPORT}
- fi
- if [ ${count} -eq 5 ];then
- ${CGE_RUN} ${SC_5} >> ${SC_REPORT}
- fi
- echo "------------------ " >> ${SC_REPORT}
- echo " End of Query #${count}" >> ${SC_REPORT}
- echo "------------------ " >> ${SC_REPORT}
-done
-echo "Script -> SC Query Run Complete" >> ${LOGFILE}
+}
+
+run_sc()
+{
+ print_date
+ echo "Script -> Starting SC Query Run" >> ${LOGFILE}
+ for count in 1 2 3 4 5
+ do
+ line
+ echo "Script -> Calling SC Query #${count}" >> ${LOGFILE}
+ if [ ${count} -eq 1 ];then
+ ${CGE_RUN} ${SC_1} >> ${SC_REPORT}
+ fi
+ if [ ${count} -eq 2 ];then
+ ${CGE_RUN} ${SC_2} >> ${SC_REPORT}
+ fi
+ if [ ${count} -eq 3 ];then
+ ${CGE_RUN} ${SC_3} >> ${SC_REPORT}
+ fi
+ if [ ${count} -eq 4 ];then
+ ${CGE_RUN} ${SC_4} >> ${SC_REPORT}
+ fi
+ if [ ${count} -eq 5 ];then
+ ${CGE_RUN} ${SC_5} >> ${SC_REPORT}
+ fi
+ echo "------------------ " >> ${SC_REPORT}
+ echo " End of Query #${count}" >> ${SC_REPORT}
+ echo "------------------ " >> ${SC_REPORT}
+ done
+ echo "Script -> SC Query Run Complete" >> ${LOGFILE}
+ print_date
}
drop_sc(){
-line
-echo "Script -> Dropping SC Database.. " >> ${LOGFILE}
-MYSQL_MASTER < ${SC_CLEAN_UP} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> Drop of SC Database Complete.. " >> ${LOGFILE}
+ echo "Script -> Dropping SC Database.. " >> ${LOGFILE}
+ $OPS_TIMER --testOp="DROP DB SC"
+ $MYSQL_MASTER < ${SC_CLEAN_UP} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ echo "Script -> Drop of SC Database Complete.. " >> ${LOGFILE}
}
create_np_db(){
-line
-echo "Script -> Creating numberportability Database.." >> ${LOGFILE}
-MYSQL_MASTER < ${NP_CREATE_DB} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> Create of numberportability Database Complete.." >> ${LOGFILE}
+ line
+ echo "Script -> Creating numberportability Database.." >> ${LOGFILE}
+ $OPS_TIMER --testOp="CREATE NP DB"
+ $MYSQL_MASTER < ${NP_CREATE_DB} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ echo "Script -> Create of numberportability Database Complete.." >> ${LOGFILE}
}
load_np(){
-line
-echo "Script -> Calling Load for numberportability.." >> ${LOGFILE}
-${NDB_RESTORE} ${LOAD_NP_ARGS} >> ${RESTORE_LOG} 2>&1
-${NDB_RESTORE} ${LOAD_NP_ARGS2} >> ${RESTORE_LOG} 2>&1
+ line
+ echo "Script -> Calling Load for numberportability.." >> ${LOGFILE}
+ $OPS_TIMER --testOp="NDB RESTORE NP"
+ ${NDB_RESTORE} ${LOAD_NP_ARGS} >> ${RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${LOAD_NP_ARGS2} >> ${RESTORE_LOG} 2>&1
+ $OPS_TIMER --end
+ check_restore
+ RC=$?
+ if [ ${RC} != 0 ];then
+ do_sql_load_np
+ fi
}
run_np(){
-echo "Script -> Starting ${NPDB} Query Run " >> ${LOGFILE}
-for count in 1 2 3 4 5 6 7
-do
- line
- echo "Script -> Calling ${NPDB} Query #${count} " >> ${LOGFILE}
- if [ ${count} -eq 1 ];then
- ${CGE_RUN} ${NP_1} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 2 ];then
- ${CGE_RUN} ${NP_2} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 3 ];then
- ${CGE_RUN} ${NP_3} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 4 ];then
- ${CGE_RUN} ${NP_4} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 5 ];then
- ${CGE_RUN} ${NP_5} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 6 ];then
- ${CGE_RUN} ${NP_6} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 7 ];then
- ${CGE_RUN} ${NP_7} >> ${NP_REPORT}
- fi
- echo "------------------ " >> ${NP_REPORT}
- echo " End of Query #${count}" >> ${NP_REPORT}
- echo "------------------ " >> ${NP_REPORT}
-done
-echo "Script -> ${NPDB} Query Run Complete" >> ${LOGFILE}
+ print_date
+ echo "Script -> Starting ${NPDB} Query Run " >> ${LOGFILE}
+ for count in 1 2 3 4 5 6 7
+ do
+ line
+ echo "Script -> Calling ${NPDB} Query #${count} " >> ${LOGFILE}
+ if [ ${count} -eq 1 ];then
+ ${CGE_RUN} ${NP_1} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 2 ];then
+ ${CGE_RUN} ${NP_2} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 3 ];then
+ ${CGE_RUN} ${NP_3} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 4 ];then
+ ${CGE_RUN} ${NP_4} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 5 ];then
+ ${CGE_RUN} ${NP_5} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 6 ];then
+ ${CGE_RUN} ${NP_6} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 7 ];then
+ ${CGE_RUN} ${NP_7} >> ${NP_REPORT}
+ fi
+ echo "------------------ " >> ${NP_REPORT}
+ echo " End of Query #${count}" >> ${NP_REPORT}
+ echo "------------------ " >> ${NP_REPORT}
+ done
+ echo "Script -> ${NPDB} Query Run Complete" >> ${LOGFILE}
+ print_date
}
drop_np(){
-line
-echo "Script -> Dropping ${NPDB} Database.. " >> ${LOGFILE}
-MYSQL_MASTER < ${NP_CLEAN_UP} >> ${SQL_LOG} 2>&1
-check_sql
-${SYNC_SLAVE}
-echo "Script -> Dropping of ${NPDB} Database Complete.. " >> ${LOGFILE}
+ echo "Script -> Dropping ${NPDB} Database.. " >> ${LOGFILE}
+ $OPS_TIMER --testOp="DROP DB NP"
+ $MYSQL_MASTER < ${NP_CLEAN_UP} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ ${SYNC_SLAVE}
+ echo "Script -> Dropping of ${NPDB} Database Complete.. " >> ${LOGFILE}
+}
+
+header()
+{
+ line
+ rint_date
+ echo "Script -> cge-rep-tester.sh "
+ echo "Script -> cge-rep-tester.sh is running..." > ${LOGFILE}
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ line
+}
+
+do_sql_load_sc()
+{
+ $OPS_TIMER --testOp="Load SC DB"
+ $MYSQL_MASTER < ${SC_DUMP} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+}
+
+rm_sc_report()
+{
+ if [ -e ${SC_REPORT} ];then
+ rm ${SC_REPORT}
+ fi
+}
+
+do_sql_load_np()
+{
+ $OPS_TIMER --testOp="Load NP DB"
+ $MYSQL_MASTER < ${NP_DUMP} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+}
+
+rm_np_report()
+{
+ if [ -e ${NP_REPORT} ];then
+ rm ${NP_REPORT}
+ fi
}
-############################
+
+#--------------
# Run Tests
-###########################
-echo "Script -> cge-rep-tester.sh "
-echo "Script -> cge-rep-tester.sh is running..." > ${LOGFILE}
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
-print_date
+#--------------
+
+header
wait_for_sql_ready
data_extraction
-
-#sc Database Test
+#SC Database Test
create_sc_db
load_sc
-check_restore
-RC=$?
-if [ ${RC} != 0 ];then
- MYSQL_MASTER < ${SC_DUMP} >> ${SQL_LOG} 2>&1
- check_sql
-fi
echo "Script -> Load for SC Complete.." >> ${LOGFILE}
-if [ -e ${SC_REPORT} ];then
- rm ${SC_REPORT}
-fi
+rm_sc_report
run_sc
drop_sc
-
-#np Database Test
+#NP Database Test
create_np_db
load_np
-check_restore
-RC=$?
-if [ ${RC} != 0 ];then
- MYSQL_MASTER < ${NP_DUMP} >> ${SQL_LOG} 2>&1
- check_sql
-fi
echo "Script -> Load for numberportability Complete.." >> ${LOGFILE}
remove_data
-if [ -e ${NP_REPORT} ];then
- rm ${NP_REPORT}
-fi
+rm_np_report
run_np
drop_np
-line
+print_date
echo "Script -> CGE Replication Testing completed at:" >> ${LOGFILE}
-print_date
echo "NDBT_ProgramExit: OK"
exit 0
+#--------------
#End of script
+#--------------
=== modified file 'drivers/cge-tester.sh'
--- a/drivers/cge-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/cge-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,23 +1,24 @@
#!/bin/bash
-################################################################################
+#---------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#---------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#---------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#---------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#--------------------
# Load Config
-#################
+#--------------------
+
CONF=$1
if [ -f $CONF ]
then
@@ -28,9 +29,10 @@ if [ -f $CONF ]
exit 1
fi
-#########################
+#--------------------
# Set Variables
-#########################
+#--------------------
+
USER=root
LOGFILE=$TESTCASE_LOG_DIR/cge.log
RESTORE_LOG=$TEST_TMP_DIR/cge-restore.log
@@ -101,225 +103,281 @@ if [ `uname -s` != "SunOS" ]
trap failed HUP INT QUIT PIPE TERM
fi
+OPS_TIMER="$OPS_TIMER --testName=cge-tester"
+
+#--------------------
+# Script Functions
+#--------------------
+
line(){
-echo ${LINE} >> ${LOGFILE}
+ echo ${LINE} >> ${LOGFILE}
}
-print_date(){
-line
-date >> ${LOGFILE}
-line
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
}
-remove_data(){
-line
-echo "Script -> Removing data files!" >> ${LOGFILE}
-if [ -d "${CGE_DATA}/sc" ] || [ -d "${CGE_DATA}/sony" ] ||
- [ -d "${CGE_DATA}/np" ] ;then
- cd ${CGE_DATA}
- rm -rf *
-fi
+remove_data()
+{
+ line
+ echo "Script -> Removing data files!" >> ${LOGFILE}
+ if [ -d "${CGE_DATA}/sc" ] || [ -d "${CGE_DATA}/sony" ] ||
+ [ -d "${CGE_DATA}/np" ] ;then
+ cd ${CGE_DATA}
+ rm -rf *
+ fi
+ echo "Script -> Restore Files Removed.." >> ${LOGFILE}
+}
+
+failed()
+{
+ remove_data
+ if [ -e ${RESTORE_LOG} ];then
+ cat ${RESTORE_LOG} >> ${LOGFILE}
+ rm ${RESTORE_LOG}
+ fi
+ if [ -e ${SQL_LOG} ];then
+ cat ${SQL_LOG} >> ${LOGFILE}
+ rm ${SQL_LOG}
+ fi
+ line
+ echo "Script -> Error Trapped, script failed!" >> ${LOGFILE}
+ print_date
+ echo ${FAILURE}
+ exit 1
}
-failed(){
-remove_data
-if [ -e ${RESTORE_LOG} ];then
- cat ${RESTORE_LOG} >> ${LOGFILE}
- rm ${RESTORE_LOG}
-fi
-if [ -e ${SQL_LOG} ];then
+check_sql()
+{
cat ${SQL_LOG} >> ${LOGFILE}
+ COUNT=`grep -i error $SQL_LOG |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ rm ${SQL_LOG}
+
+ echo "Script -> SQL failed!" >> ${LOGFILE}
+ ${MYSQL_MASTER} -e "SHOW ERRORS;" >> ${LOGFILE} 2>&1
+ failed
+ fi
rm ${SQL_LOG}
-fi
-line
-echo "Script -> Error Trapped, script failed!" >> ${LOGFILE}
-print_date
-echo ${FAILURE}
-exit 1
-}
-
-check_sql(){
-cat ${SQL_LOG} >> ${LOGFILE}
-COUNT=`grep -i error $SQL_LOG |wc -l`
-if [ ${COUNT} -ne 0 ];then
- rm ${SQL_LOG}
- echo "Script -> SQL failed!" >> ${LOGFILE}
- failed
-fi
-rm ${SQL_LOG}
}
-check_restore(){
-cat ${RESTORE_LOG} >> ${LOGFILE}
-COUNT=`grep -i fail ${RESTORE_LOG} |wc -l`
-if [ ${COUNT} -ne 0 ];then
+check_restore()
+{
+ cat ${RESTORE_LOG} >> ${LOGFILE}
+ COUNT=`grep -i fail ${RESTORE_LOG} |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ rm ${RESTORE_LOG}
+ echo "NDB RESTORE failed, trying SQL Dump!" >> ${LOGFILE}
+ return 1
+ fi
rm ${RESTORE_LOG}
- echo "NDB RESTORE failed, trying SQL Dump!" >> ${LOGFILE}
- return 1
-fi
-rm ${RESTORE_LOG}
-return 0
+ return 0
}
-data_extraction(){
-line
-echo "Script -> Extracting Data..." >> ${LOGFILE}
-${EXTRACT_DATA} ${CGE_DATA} >> ${LOGFILE}
-echo "Script -> Data Extracted..." >> ${LOGFILE}
+data_extraction()
+{
+ line
+ echo "Script -> Extracting Data..." >> ${LOGFILE}
+ ${EXTRACT_DATA} ${CGE_DATA} >> ${LOGFILE}
+ echo "Script -> Data Extracted..." >> ${LOGFILE}
}
-create_sc_db(){
-line
-echo "Script -> Creating sc Database.." >> ${LOGFILE}
-MYSQL_MASTER < ${SC_CREATE_DB} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> sc Database Created.." >> ${LOGFILE}
+create_sc_db()
+{
+ line
+ echo "Script -> Creating sc Database.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE DB SC"
+ ${MYSQL_MASTER} < ${SC_CREATE_DB} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+ echo "Script -> sc Database Created.." >> ${LOGFILE}
}
-load_sc(){
-line
-echo "Script -> Calling Load for SC.." >> ${LOGFILE}
-${NDB_RESTORE} ${LOAD_SC_ARGS} >> ${RESTORE_LOG} 2>&1
+load_sc()
+{
+ line
+ echo "Script -> Calling Load for SC.." >> ${LOGFILE}
+ $OPS_TIMER --testOp="NDB RESTORE SC"
+ ${NDB_RESTORE} ${LOAD_SC_ARGS} >> ${RESTORE_LOG} 2>&1
+ $OPS_TIMER --end
+ check_restore
+ RC=$?
+ if [ ${RC} != 0 ];then
+ $OPS_TIMER --testOp="SQL LOAD SC"
+ $MYSQL_MASTER < ${SC_DUMP} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ fi
+ echo "Script -> Load for numberportability Complete.." >> ${LOGFILE}
+}
+
+run_sc()
+{
+ print_date
+ echo "Script -> Starting SC Query Run" >> ${LOGFILE}
+ for count in 1 2 3 4 5
+ do
+ line
+ echo "Script -> Calling SC Query #${count}" >> ${LOGFILE}
+ if [ ${count} -eq 1 ];then
+ ${CGE_RUN} ${SC_1} >> ${SC_REPORT}
+ fi
+ if [ ${count} -eq 2 ];then
+ ${CGE_RUN} ${SC_2} >> ${SC_REPORT}
+ fi
+ if [ ${count} -eq 3 ];then
+ ${CGE_RUN} ${SC_3} >> ${SC_REPORT}
+ fi
+ if [ ${count} -eq 4 ];then
+ ${CGE_RUN} ${SC_4} >> ${SC_REPORT}
+ fi
+ if [ ${count} -eq 5 ];then
+ ${CGE_RUN} ${SC_5} >> ${SC_REPORT}
+ fi
+ echo "------------------ " >> ${SC_REPORT}
+ echo " End of Query #${count}" >> ${SC_REPORT}
+ echo "------------------ " >> ${SC_REPORT}
+ done
+ print_date
+ echo "Script -> SC Query Run Complete" >> ${LOGFILE}
}
-run_sc(){
-echo "Script -> Starting SC Query Run" >> ${LOGFILE}
-for count in 1 2 3 4 5
-do
+drop_sc()
+{
line
- echo "Script -> Calling SC Query #${count}" >> ${LOGFILE}
- if [ ${count} -eq 1 ];then
- ${CGE_RUN} ${SC_1} >> ${SC_REPORT}
- fi
- if [ ${count} -eq 2 ];then
- ${CGE_RUN} ${SC_2} >> ${SC_REPORT}
- fi
- if [ ${count} -eq 3 ];then
- ${CGE_RUN} ${SC_3} >> ${SC_REPORT}
- fi
- if [ ${count} -eq 4 ];then
- ${CGE_RUN} ${SC_4} >> ${SC_REPORT}
- fi
- if [ ${count} -eq 5 ];then
- ${CGE_RUN} ${SC_5} >> ${SC_REPORT}
- fi
- echo "------------------ " >> ${SC_REPORT}
- echo " End of Query #${count}" >> ${SC_REPORT}
- echo "------------------ " >> ${SC_REPORT}
-done
-echo "Script -> SC Query Run Complete" >> ${LOGFILE}
+ echo "Script -> Dropping SC Database.. " >> ${LOGFILE}
+ $OPS_TIMER --testOp="DROP DB SC"
+ $MYSQL_MASTER < ${SC_CLEAN_UP} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ echo "Script -> Drop of SC Database Complete.. " >> ${LOGFILE}
}
-drop_sc(){
-line
-echo "Script -> Dropping SC Database.. " >> ${LOGFILE}
-MYSQL_MASTER < ${SC_CLEAN_UP} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> Drop of SC Database Complete.. " >> ${LOGFILE}
+create_np_db()
+{
+ line
+ echo "Script -> Creating numberportability Database.." >> ${LOGFILE}
+ $OPS_TIMER --testOp="CREATE DB NP"
+ $MYSQL_MASTER < ${NP_CREATE_DB} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ echo "Script -> Create of numberportability Database Complete.." >> ${LOGFILE}
}
-create_np_db(){
-line
-echo "Script -> Creating numberportability Database.." >> ${LOGFILE}
-MYSQL_MASTER < ${NP_CREATE_DB} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> Create of numberportability Database Complete.." >> ${LOGFILE}
+load_np()
+{
+ line
+ echo "Script -> Calling Load for numberportability.." >> ${LOGFILE}
+ $OPS_TIMER --testOp="NDB RESTORE NP"
+ ${NDB_RESTORE} ${LOAD_NP_ARGS} >> ${RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${LOAD_NP_ARGS2} >> ${RESTORE_LOG} 2>&1
+ $OPS_TIMER --end
+ check_restore
+ RC=$?
+ if [ ${RC} != 0 ];then
+ $OPS_TIMER --testOp="SQL LOAD NP"
+ $MYSQL_MASTER < ${NP_DUMP} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ fi
}
-load_np(){
-line
-echo "Script -> Calling Load for numberportability.." >> ${LOGFILE}
-${NDB_RESTORE} ${LOAD_NP_ARGS} >> ${RESTORE_LOG} 2>&1
-${NDB_RESTORE} ${LOAD_NP_ARGS2} >> ${RESTORE_LOG} 2>&1
+run_np()
+{
+ print_date
+ echo "Script -> Starting ${NPDB} Query Run " >> ${LOGFILE}
+ for count in 1 2 3 4 5 6 7
+ do
+ line
+ echo "Script -> Calling ${NPDB} Query #${count} " >> ${LOGFILE}
+ if [ ${count} -eq 1 ];then
+ ${CGE_RUN} ${NP_1} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 2 ];then
+ ${CGE_RUN} ${NP_2} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 3 ];then
+ ${CGE_RUN} ${NP_3} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 4 ];then
+ ${CGE_RUN} ${NP_4} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 5 ];then
+ ${CGE_RUN} ${NP_5} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 6 ];then
+ ${CGE_RUN} ${NP_6} >> ${NP_REPORT}
+ fi
+ if [ ${count} -eq 7 ];then
+ ${CGE_RUN} ${NP_7} >> ${NP_REPORT}
+ fi
+ echo "------------------ " >> ${NP_REPORT}
+ echo " End of Query #${count}" >> ${NP_REPORT}
+ echo "------------------ " >> ${NP_REPORT}
+ done
+ print_date
+ echo "Script -> ${NPDB} Query Run Complete" >> ${LOGFILE}
+}
+
+drop_np()
+{
+ line
+ echo "Script -> Dropping ${NPDB} Database.. " >> ${LOGFILE}
+ $OPS_TIMER --testOp="DROP DB NP"
+ $MYSQL_MASTER < ${NP_CLEAN_UP} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ echo "Script -> Dropping of ${NPDB} Database Complete.. " >> ${LOGFILE}
}
-run_np(){
-echo "Script -> Starting ${NPDB} Query Run " >> ${LOGFILE}
-for count in 1 2 3 4 5 6 7
-do
- line
- echo "Script -> Calling ${NPDB} Query #${count} " >> ${LOGFILE}
- if [ ${count} -eq 1 ];then
- ${CGE_RUN} ${NP_1} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 2 ];then
- ${CGE_RUN} ${NP_2} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 3 ];then
- ${CGE_RUN} ${NP_3} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 4 ];then
- ${CGE_RUN} ${NP_4} >> ${NP_REPORT}
+rm_sc_report()
+{
+ if [ -e ${SC_REPORT} ];then
+ rm ${SC_REPORT}
fi
- if [ ${count} -eq 5 ];then
- ${CGE_RUN} ${NP_5} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 6 ];then
- ${CGE_RUN} ${NP_6} >> ${NP_REPORT}
- fi
- if [ ${count} -eq 7 ];then
- ${CGE_RUN} ${NP_7} >> ${NP_REPORT}
- fi
- echo "------------------ " >> ${NP_REPORT}
- echo " End of Query #${count}" >> ${NP_REPORT}
- echo "------------------ " >> ${NP_REPORT}
-done
-echo "Script -> ${NPDB} Query Run Complete" >> ${LOGFILE}
}
-drop_np(){
-line
-echo "Script -> Dropping ${NPDB} Database.. " >> ${LOGFILE}
-MYSQL_MASTER < ${NP_CLEAN_UP} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> Dropping of ${NPDB} Database Complete.. " >> ${LOGFILE}
+rm_np_report()
+{
+ if [ -e ${NP_REPORT} ];then
+ rm ${NP_REPORT}
+ fi
}
-############################
-# Run Tests
-###########################
-echo "Script -> cge-tester.sh "
+
+header()
+{
+print_date
+echo "Script -> cge-tester.sh "
echo "Script -> cge-tester.sh is running..." > ${LOGFILE}
echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
-print_date
+}
+
+#-----------
+# Run Tests
+#-----------
+header
data_extraction
#sc Database Test
create_sc_db
load_sc
-check_restore
-RC=$?
-if [ ${RC} != 0 ];then
- MYSQL_MASTER < ${SC_DUMP} >> ${SQL_LOG} 2>&1
- check_sql
-fi
-echo "Script -> Load for SC Complete.." >> ${LOGFILE}
-if [ -e ${SC_REPORT} ];then
- rm ${SC_REPORT}
-fi
+rm_sc_report
run_sc
drop_sc
#np Database Test
create_np_db
load_np
-check_restore
-RC=$?
-if [ ${RC} != 0 ];then
- MYSQL_MASTER < ${NP_DUMP} >> ${SQL_LOG} 2>&1
- check_sql
-fi
-echo "Script -> Load for numberportability Complete.." >> ${LOGFILE}
-echo "Script -> Removing Restore Files.." >> ${LOGFILE}
remove_data
-echo "Script -> Restore Files Removed.." >> ${LOGFILE}
-if [ -e ${NP_REPORT} ];then
- rm ${NP_REPORT}
-fi
+rm_np_report
run_np
drop_np
+print_date
line
echo "Script -> CGE Replication Testing completed at:" >> $LOGFILE
-print_date
echo "NDBT_ProgramExit: OK"
exit 0
=== modified file 'drivers/ins-del-rep-tester.sh'
--- a/drivers/ins-del-rep-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/ins-del-rep-tester.sh 2009-02-13 21:08:34 +0000
@@ -120,13 +120,15 @@ if [ ${RC} -ne 0 ]; then
failed
fi
}
-
+############## RUN TEST ##################
echo "ins-del-rep-tester.sh"
echo "Script -> ins-del-rep-tester.sh is running..." > ${LOGFILE}
print_date
echo "Script -> Configuration file has been loaded..." >> $LOGFILE
wait_for_sql_ready
+print_date
load_db2
+print_date
slave_verification
print_date
echo "NDBT_ProgramExit: OK"
=== added file 'drivers/ins-del-tester.sh'
--- a/drivers/ins-del-tester.sh 1970-01-01 00:00:00 +0000
+++ b/drivers/ins-del-tester.sh 2009-02-13 21:08:34 +0000
@@ -0,0 +1,174 @@
+#!/bin/bash
+#---------------------------------------------------------------------------------
+# This script is built to run under Cluster Replication Automation and is called
+# by ATRT once the MASTER and SLAVE clusters (including mysqld process) have been
+# started
+# acrt = automated cluster replication testing
+#---------------------------------------------------------------------------------
+
+#set -x
+#---------------------------------------------------------------------------------
+# Set X is for debugging. Should be commented out for runs or it will cause
+# test failure
+#---------------------------------------------------------------------------------
+
+OKAY="NDBT_ProgramExit: OK"
+FAILURE="NDBT_ProgramExit: Failed"
+PWD=`pwd`
+
+#----------------
+# Load Config
+#----------------
+
+CONF=${1}
+if [ -f ${CONF} ]
+ then
+ . ${CONF}
+ else
+ echo "Load Config"
+ echo ${FAILURE}
+ exit 1
+fi
+
+#----------------
+# Set Variables
+#----------------
+
+LOGFILE=${TESTCASE_LOG_DIR}/ins-del.log
+RPTFILE=${TESTCASE_LOG_DIR}/ins-del.rpt
+CSVFILE=${TESTCASE_LOG_DIR}/ins-del.csv
+PKFILE=${TESTCASE_LOG_DIR}/ins-del.pk
+PERF_REPORT=${TESTCASE_LOG_DIR}/ins-del-perf.rpt
+TEST_DIR=${TEST_SCRIPTS_DIR}/insert_delete
+LINE="==========================================="
+BLOB=${TEST_DIR}/logo-mysql.jpg
+DELINS=100000
+ROWS=250000
+
+
+TEST="${PERL} ${TEST_DIR}/load_and_delete.pl"
+TEST="${TEST} --port=${MASTER_PORT} --host=${MASTER} --log=${LOGFILE}"
+TEST="${TEST} --blob=${BLOB} -i ${DELINS} -ro ${ROWS} -c ${CSVFILE}"
+TEST="${TEST} -re ${RPTFILE}"
+
+INIT_RDB="${INIT_RDB} -testN LOAD-DELETE -pk ${PKFILE} -l ${LOGFILE}"
+INIT_RDB="${INIT_RDB} -testP test/load_and_delete -testS ins-del-tester.sh"
+
+UPDATE_RDB="${UPDATE_RDB} -pkF ${PKFILE} -res ${CSVFILE} -info ${INFOFILE}"
+UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
+
+RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFOFILE} -re ${PERF_REPORT}"
+
+#--------------------
+# Script Functions
+#--------------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+failed()
+{
+ print_date
+ echo "exit->1" >> ${INFOFILE}
+ end_time
+ echo ${FAILURE} >> ${LOGFILE}
+ echo ${FAILURE}
+ exit 1
+}
+
+
+run()
+{
+ line
+ echo "Script -> Calling insert delete.." >> ${LOGFILE}
+ ${TEST} >> ${LOGFILE}
+ RC=$?
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> test failed" >> ${LOGFILE}
+ failed
+ fi
+ echo "exit->0" >> ${INFOFILE}
+ end_time
+ echo "Script -> test completed...." >> ${LOGFILE}
+}
+
+header()
+{
+ print_date
+ echo "ins-del-tester.sh"
+ echo "Script -> ins-del-tester.sh is running..." > ${LOGFILE}
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+}
+
+finish()
+{
+ print_date
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+}
+
+update_info()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo "name->INSERT-DELETE" >> ${INFOFILE}
+ echo "testType->PERFORMANCE" >> ${INFOFILE}
+ echo "tag->STC" >> ${INFOFILE}
+ echo "dataType->float" >> ${INFOFILE}
+ echo "description->Seconds To Complete Testing" >> ${INFOFILE}
+ echo "tr-description->PERF TESTING" >> ${INFOFILE}
+ STARTTIME=`date +'%F %T'`
+ echo "start->${STARTTIME}" >> ${INFOFILE}
+ line
+ echo ${INIT_RDB} >> ${LOGFILE}
+ ${INIT_RDB}
+ line
+ fi
+}
+
+update_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ line
+ ${UPDATE_RDB}
+ fi
+}
+
+results_rpt()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ line
+ ${RESULTS_REPORT}
+ fi
+}
+
+end_time()
+{
+ ENDTIME=`date +'%F %T'`
+ echo "end->${ENDTIME}" >> ${INFOFILE}
+}
+
+#---------------
+# RUN TEST
+#---------------
+
+header
+update_info
+run
+update_bm
+#results_rpt
+finish
+
+#---------------
+# End of driver
+#---------------
=== modified file 'drivers/joins-tester.sh'
--- a/drivers/joins-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/joins-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,69 +1,104 @@
#!/bin/bash
-################################################################################
+#------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#---------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#---------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-#########################
+#------------------
# Set Variables
-#########################
+#------------------
+
USER=root
-SQL_LOG=$TEST_TMP_DIR/sql.log
-RESTORE_LOG=$TEST_TMP_DIR/restore.log
-LOGFILE=$TESTCASE_LOG_DIR/joins.log
-REPORT=$TESTCASE_LOG_DIR/joins.rpt
-JOINS_EXE=$INSTALL_BIN_DIR/JoinsTest
-JOINS_DATA_DIR=$TEST_SCRIPTS_DIR/joinAtomics/data
+SQL_LOG=${TEST_TMP_DIR}/sql.log
+RESTORE_LOG=${TEST_TMP_DIR}/restore.log
+LOGFILE=${TESTCASE_LOG_DIR}/joins.log
+REPORT=${TESTCASE_LOG_DIR}/joins.rpt
+JOINS_EXE=${INSTALL_BIN_DIR}/JoinsTest
+JOINS_DATA_DIR=${TEST_SCRIPTS_DIR}/joinAtomics/data
LINE="==========================================="
-JOINS_DATA="$EXTRACT_DATA $JOINS_DATA_DIR"
+JOINS_DATA="${EXTRACT_DATA} ${JOINS_DATA_DIR}"
+JOINS_MASTER="${MYSQL} --host=${MASTER} -u root --protocol=tcp --port=${MASTER_PORT}"
#Load databases
-LOAD_JOINS_DB_1=" -c $NDB_MASTER:$NDB_MASTER_PORT -n 2 -b 1 -m -r $JOINS_DATA_DIR/"
-LOAD_JOINS_DB_2=" -c $NDB_MASTER:$NDB_MASTER_PORT -n 3 -b 1 -r $JOINS_DATA_DIR/"
+LOAD_JOINS_DB_1=" -c ${NDB_MASTER}:${NDB_MASTER_PORT} -n 2 -b 1 -m -r ${JOINS_DATA_DIR}/"
+LOAD_JOINS_DB_2=" -c ${NDB_MASTER}:${NDB_MASTER_PORT} -n 3 -b 1 -r ${JOINS_DATA_DIR}/"
-ARGS="--host $MASTER --user $USER --port $MASTER_PORT"
-ARGS2="--results $REPORT --test ALL --timed 200"
-ARGS3="--no-create-db"
-
-CREATE_JOINS_DB=$TEST_SCRIPTS_DIR/joinAtomics/dbCreate.sql
-DROP_JOINS_DB=$TEST_SCRIPTS_DIR/joinAtomics/dbCleanup.sql
-
-check_sql(){
-cat $SQL_LOG >> $LOGFILE
-if [ `grep -i error $SQL_LOG |wc -l` != 0 ];then
- rm $SQL_LOG
- echo "Script -> SQL failed!" >> $LOGFILE
- echo $FAILURE
- exit 1
-fi
-rm $SQL_LOG
+ARGS="--host ${MASTER} --user ${USER} --port ${MASTER_PORT}"
+ARGS="${ARGS} --results ${REPORT} --test ALL --timed 200"
+ARGS="${ARGS} --no-create-db --verbose"
+
+CREATE_JOINS_DB=${TEST_SCRIPTS_DIR}/joinAtomics/dbCreate.sql
+DROP_JOINS_DB=${TEST_SCRIPTS_DIR}/joinAtomics/dbCleanup.sql
+
+OPS_TIMER="${OPS_TIMER} --testName=joins"
+
+#------------------
+# Script Functions
+#------------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+check_sql()
+{
+ cat ${SQL_LOG} >> ${LOGFILE}
+ if [ `grep -i error ${SQL_LOG} |wc -l` -ne 0 ];then
+ rm ${SQL_LOG}
+ echo "Script -> SQL failed!" >> ${LOGFILE}
+ ${MYSQL_MASTER} -e "SHOW ERRORS;" >> ${LOGFILE} 2>&1
+ echo ${FAILURE}
+ exit 1
+ fi
+ rm ${SQL_LOG}
+}
+
+extract_data()
+{
+ ${JOINS_DATA}
+ if [ -d ${JOINS_DATA_DIR} ]; then
+ PWD=`pwd`
+ cd ${JOINS_DATA_DIR}
+ FILECOUNT=`ls|wc -l`
+ cd ${PWD}
+ fi
+ if [ ${FILECOUNT} -eq 0 ];then
+ echo "Script -> Data Extract failed!" >> ${LOGFILE}
+ echo ${FAILURE}
+ exit 1
+ fi
}
-remove_data(){
+remove_data()
+{
+ line
+ echo "Script -> Removing data files..." >> ${LOGFILE}
if [ -d ${JOINS_DATA_DIR} ]; then
PWD=`pwd`
cd ${JOINS_DATA_DIR}
@@ -77,63 +112,100 @@ remove_data(){
echo "Script -> Data files removed..." >> ${LOGFILE}
}
-############################
-# Run Tests
-###########################
+ndb_restore_backup()
+{
+ line
+ echo "Script -> Restoring Joins DB.. " >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="NDB RESTORE JOINS"
+ ${NDB_RESTORE} ${LOAD_JOINS_DB_1} >> ${RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${LOAD_JOINS_DB_2} >> ${RESTORE_LOG} 2>&1
+ ${OPS_TIMER} --end
+ cat ${RESTORE_LOG} >> ${LOGFILE}
+ COUNT=`grep -i fail ${RESTORE_LOG} |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ echo "NDB RESTORE failed!" >> ${LOGFILE}
+ rm ${RESTORE_LOG}
+ remove_data
+ echo ${FAILURE}
+ exit 1
+ fi
+ rm -f ${RESTORE_LOG}
+ echo "Script -> Restoring complete.. " >> ${LOGFILE}
+}
-#echo "joins-tester.sh"
-echo "Script -> joins-tester.sh is running..." > $LOGFILE
-echo $LINE >> $LOGFILE
-date >> $LOGFILE
-
-echo $LINE >> $LOGFILE
-echo "Script -> Configuration file has been loaded..." >> $LOGFILE
-
-echo $LINE >> $LOGFILE
-echo "Script -> Creating Joins Database.." >> $LOGFILE
-MYSQL_MASTER < $CREATE_JOINS_DB >> $SQL_LOG 2>&1
-check_sql
-
-
-echo $LINE >> $LOGFILE
-echo "Script -> Restoring Joins DB.. " >> $LOGFILE
-$JOINS_DATA
-$NDB_RESTORE $LOAD_JOINS_DB_1 >> $RESTORE_LOG 2>&1
-$NDB_RESTORE $LOAD_JOINS_DB_2 >> $RESTORE_LOG 2>&1
-echo $LINE >> $LOGFILE
-cat $RESTORE_LOG >> $LOGFILE
-COUNT=`grep -i fail $RESTORE_LOG |wc -l`
-if [ ${COUNT} -ne 0 ];then
- echo "NDB RESTORE failed!" >> $LOGFILE
- rm $RESTORE_LOG
- remove_data
- echo $FAILURE
- exit 1
-fi
-rm -f $RESTORE_LOG
-remove_data
+drop_db()
+{
+ line
+ echo "Script -> Dropping Joins Database.. " >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="DROP DB JOINS"
+ ${JOINS_MASTER} < ${DROP_JOINS_DB} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+ echo "Script -> Joins Database dropped.. " >> ${LOGFILE}
+}
-echo $LINE >> $LOGFILE
-echo "Script -> Running Joins Tests.... " >> $LOGFILE
-$JOINS_EXE $ARGS $ARGS2 $ARGS3 >> $LOGFILE
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo $FAILURE
- exit 1
-fi
-echo "Script -> Joins Test Run Completed.... " >> $LOGFILE
+run_test()
+{
+ print_date
+ echo "Script -> Running Joins Tests.... " >> ${LOGFILE}
+ ${JOINS_EXE} ${ARGS} >> ${LOGFILE}
+ RC=$?
+ if [ ${RC} -ne 0 ]; then
+ echo "Test run failed!" >> ${LOGFILE}
+ drop_db
+ echo ${FAILURE}
+ exit 1
+ fi
+ print_date
+ echo "Script -> Joins Test Run Completed.... " >> ${LOGFILE}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+header()
+{
+ line
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> joins-tester.sh is running..." > ${LOGFILE}
+ echo "Script -> joins-tester.sh"
+}
+
+create_db()
+{
+ line
+ echo "Script -> Creating Joins Database.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE DB JOINS"
+ ${JOINS_MASTER} < ${CREATE_JOINS_DB} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+ echo "Script -> Database Created.." >> ${LOGFILE}
+}
+
+finish()
+{
+ line
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+}
-echo $LINE >> $LOGFILE
-echo "Script -> Dropping Joins Database.. " >> $LOGFILE
-MYSQL_MASTER < $DROP_JOINS_DB >> $SQL_LOG 2>&1
-check_sql
-echo "Script -> Joins Database dropped.. " >> $LOGFILE
-
-echo $LINE >> $LOGFILE
-date >> $LOGFILE
-echo $LINE >> $LOGFILE
-echo "NDBT_ProgramExit: OK"
-sleep 3
-exit 0
+#-------------
+# Run Tests
+#-------------
+
+header
+extract_data
+create_db
+ndb_restore_backup
+remove_data
+run_test
+drop_db
+finish
+#----------------
#End of script
+#----------------
=== added file 'drivers/ndbatomics-dd-ldf-tester.sh'
--- a/drivers/ndbatomics-dd-ldf-tester.sh 1970-01-01 00:00:00 +0000
+++ b/drivers/ndbatomics-dd-ldf-tester.sh 2009-02-13 21:08:34 +0000
@@ -0,0 +1,179 @@
+#!/bin/bash
+################################################################################
+# This script is built to run under Cluster Replication Automation and is called
+# by ATRT once the master and slave clusters (including mysqld process) have been
+# started
+# acrt = automated cluster replication testing
+################################################################################
+
+###########################################################################
+# Set X is for debugging. Should be commented out for runs or it will cause
+# test failure
+###########################################################################
+#set -x
+
+OKAY="NDBT_ProgramExit: OK"
+FAILURE="NDBT_ProgramExit: Failed"
+
+#################
+# Load Config
+#################
+CONF=$1
+if [ -f $CONF ]
+ then
+ . $CONF
+ else
+ echo "Load Config"
+ echo $FAILURE
+ exit 1
+fi
+
+#########################
+# Set Variables
+#########################
+DB=ndbatomics
+LOGFILE=${TESTCASE_LOG_DIR}/${DB}-dd.log
+PK_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.pk
+INFO_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.info
+CSV_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.csv
+PERF_REPORT=${TESTCASE_LOG_DIR}/${DB}-dd.performance.rpt
+RF=${TESTCASE_LOG_DIR}/${DB}-dd.rpt
+NDBA_DIR=${TEST_SCRIPTS_DIR}/${DB}
+TEST_RUN_TIME=300
+GROUP_OPS=900
+NDBA_SRC_DIR=${NDBA_DIR}/src
+EXE=${NDBA_SRC_DIR}/NDBAtomics
+LINE="==========================================="
+DROP_DB=${NDBA_DIR}/dbCleanup.sql
+LOAD_DB="${PERL} ${NDBA_DIR}/load_atomics.pl"
+
+#UPDATE_BM_DATABASE=""
+
+#Load database
+LOAD="${LOAD_DB} --port=${MASTER_PORT} -e ndbdd -d ${DB}"
+LOAD="${LOAD} --host=${MASTER} --user=root --numTSData=2"
+LOAD="${LOAD} --tsFileSize=2000M"
+
+#Test Driver
+DRIVER="${EXE} -c ${NDB_MASTER}:${NDB_MASTER_PORT}"
+DRIVER="${DRIVER} --results ${RF}"
+DRIVER="${DRIVER} --cvs ${CSV_FILE}"
+DRIVER="${DRIVER} -g -n ${GROUP_OPS}"
+DRIVER="${DRIVER} -t ALL --timed ${TEST_RUN_TIME}"
+
+INIT_RDB="${INIT_RDB} -testN ${DB}-dd -pk ${PK_FILE} -l ${LOGFILE}"
+INIT_RDB="${INIT_RDB} -testP ${EXE} -testS ${DB}-dd-tester.sh"
+
+UPDATE_RDB="${UPDATE_RDB} -pkF ${PK_FILE} -res ${CSV_FILE} -info ${INFO_FILE}"
+UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
+
+RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFO_FILE} -re ${PERF_REPORT}"
+RESULTS_REPORT="${RESULTS_REPORT} --atomics"
+
+VERIFY="$PERL $SLAVE_VERIFICATION -mho $MASTER -mpo $MASTER_PORT -vD $DB"
+VERIFY="$VERIFY -l $LOGFILE --test=${DB}-dd -rdd --dropOnly -num 40"
+
+
+line(){
+ echo ${LINE} >> ${LOGFILE}
+}
+
+end_time(){
+ ENDTIME=`date +'%F %T'`
+ echo "end->${ENDTIME}" >> ${INFO_FILE}
+}
+
+print_date(){
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+failed(){
+ print_date
+ echo "exit->1" >> ${INFO_FILE}
+ end_time
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ ${UPDATE_RDB}
+ fi
+ clean
+ echo $FAILURE
+ exit 1
+}
+
+load(){
+ line
+ echo "Script -> Calling Load..." >> ${LOGFILE}
+ ${LOAD}
+ RC=$?
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load failed" >> ${LOGFILE}
+ failed
+ fi
+}
+
+run(){
+ line
+ echo "Script -> Running Test" >> ${LOGFILE}
+ ${DRIVER}
+ RC=$?
+ if [ ${RC} -ne 0 ]; then
+ echo "Script ->run failed!!!!!" >> $LOGFILE
+ failed
+ fi
+}
+
+clean(){
+ line
+ echo "Script -> Dropping database.." >> ${LOGFILE}
+ # mysql_master < ${DROP_DB} >> ${LOGFILE} 2>&1
+ ${VERIFY}
+}
+
+############################
+# Run Tests
+###########################
+echo "Script -> ndbatomics-dd-tester.sh..."
+echo "Script -> ndbatomics-dd-tester.sh is running..." > ${LOGFILE}
+print_date
+echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+load
+#----------Update Information file and INIT BM DB--------
+echo "name->${DB}-dd" >> ${INFO_FILE}
+echo "testType->PERFORMANCE" >> ${INFO_FILE}
+echo "tag->TPS" >> ${INFO_FILE}
+echo "dataType->float" >> ${INFO_FILE}
+echo "description->PERFORMANCE TESTING" >> ${INFO_FILE}
+echo "tr-description->ATOMICS TESTING" >> ${INFO_FILE}
+STARTTIME=`date +'%F %T'`
+echo "start->${STARTTIME}" >> ${INFO_FILE}
+line
+if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${INIT_RDB} >> ${LOGFILE}
+ ${INIT_RDB}
+fi
+line
+#------------------------------------------
+run
+#----------Update Information file and BM DB--------
+end_time
+echo "exit->0" >> ${INFO_FILE}
+line
+if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ ${UPDATE_RDB}
+fi
+line
+#------------------------------------------
+clean
+line
+if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ ${RESULTS_REPORT}
+fi
+line
+print_date
+echo "NDBT_ProgramExit: OK"
+exit 0
+
+#End of script
=== modified file 'drivers/ndbatomics-dd-tester.sh'
--- a/drivers/ndbatomics-dd-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/ndbatomics-dd-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,37 +1,41 @@
#!/bin/bash
-################################################################################
+#--------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#--------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#--------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#--------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#------------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#------------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-#########################
+#----------------
# Set Variables
-#########################
+#----------------
+
DB=ndbatomics
+LINE="==========================================="
+#FILES/DIRS
LOGFILE=${TESTCASE_LOG_DIR}/${DB}-dd.log
PK_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.pk
INFO_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.info
@@ -39,19 +43,29 @@ CSV_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.cs
PERF_REPORT=${TESTCASE_LOG_DIR}/${DB}-dd.performance.rpt
RF=${TESTCASE_LOG_DIR}/${DB}-dd.rpt
NDBA_DIR=${TEST_SCRIPTS_DIR}/${DB}
+NDBA_SRC_DIR=${NDBA_DIR}/src
+DROP_DB=${NDBA_DIR}/dbCleanup.sql
+#NDBATOMICS
TEST_RUN_TIME=300
GROUP_OPS=900
-NDBA_SRC_DIR=${NDBA_DIR}/src
EXE=${NDBA_SRC_DIR}/NDBAtomics
-LINE="==========================================="
-DROP_DB=${NDBA_DIR}/dbCleanup.sql
+#LOAD
+NUMDATA=20
+NUMUNDO=3
+DATAFILESIZE="400M"
+UNDOSIZE="1000M"
+UNDOBUFFER="400M"
LOAD_DB="${PERL} ${NDBA_DIR}/load_atomics.pl"
+NUMOFROWS=1000000
#UPDATE_BM_DATABASE=""
#Load database
LOAD="${LOAD_DB} --port=${MASTER_PORT} -e ndbdd -d ${DB}"
LOAD="${LOAD} --host=${MASTER} --user=root"
+LOAD="${LOAD} -numL ${NUMUNDO} --lfgFileSize=${UNDOSIZE}"
+LOAD="${LOAD} --numTSData=${NUMDATA} --tsFileSize=${DATAFILESIZE}"
+LOAD="${LOAD} --numAcc=${NUMOFROWS}"
#Test Driver
DRIVER="${EXE} -c ${NDB_MASTER}:${NDB_MASTER_PORT}"
@@ -69,26 +83,36 @@ UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFO_FILE} -re ${PERF_REPORT}"
RESULTS_REPORT="${RESULTS_REPORT} --atomics"
-VERIFY="$PERL $SLAVE_VERIFICATION -mho $MASTER -mpo $MASTER_PORT -vD $DB"
-VERIFY="$VERIFY -l $LOGFILE --test=${DB}-dd -rdd --dropOnly -num 40"
+VERIFY="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER} -mpo ${MASTER_PORT} -vD ${DB}"
+VERIFY="${VERIFY} -l ${LOGFILE} --test=${DB}-dd -rdd --dropOnly -num 40"
+OPS_TIMER="${OPS_TIMER} --testName=ndbatomics-dd-tester"
-line(){
+#---------------------
+# Script Functions
+#---------------------
+
+line()
+{
echo ${LINE} >> ${LOGFILE}
}
-end_time(){
+end_time()
+{
ENDTIME=`date +'%F %T'`
echo "end->${ENDTIME}" >> ${INFO_FILE}
+ echo "exit->0" >> ${INFO_FILE}
}
-print_date(){
+print_date()
+{
line
date >> ${LOGFILE}
line
}
-failed(){
+failed()
+{
print_date
echo "exit->1" >> ${INFO_FILE}
end_time
@@ -103,75 +127,108 @@ failed(){
load(){
line
echo "Script -> Calling Load..." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="LOAD ATOMICS DB"
${LOAD}
RC=$?
if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
echo "Script -> Load failed" >> ${LOGFILE}
failed
fi
+ ${OPS_TIMER} --end
}
-run(){
+run()
+{
line
+ print_date
echo "Script -> Running Test" >> ${LOGFILE}
${DRIVER}
RC=$?
if [ ${RC} -ne 0 ]; then
- echo "Script ->run failed!!!!!" >> $LOGFILE
+ echo "Script ->run failed!!!!!" >> ${LOGFILE}
failed
fi
+ print_date
+ echo "Script -> Running Test" >> ${LOGFILE}
}
-clean(){
+clean()
+{
line
echo "Script -> Dropping database.." >> ${LOGFILE}
- # mysql_master < ${DROP_DB} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --testOp="DROP DB & DD"
${VERIFY}
+ ${OPS_TIMER} --end
}
-############################
+header()
+{
+ print_date
+ echo "Script -> ndbatomics-dd-tester.sh..."
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> ndbatomics-dd-tester.sh is running..." > ${LOGFILE}
+ line
+}
+
+info_file_update()
+{
+ echo "Updating Information file" >> ${LOGFILE}
+ echo "name->${DB}-dd" >> ${INFO_FILE}
+ echo "testType->PERFORMANCE" >> ${INFO_FILE}
+ echo "tag->TPS" >> ${INFO_FILE}
+ echo "dataType->float" >> ${INFO_FILE}
+ echo "description->PERFORMANCE TESTING" >> ${INFO_FILE}
+ echo "tr-description->ATOMICS TESTING" >> ${INFO_FILE}
+ STARTTIME=`date +'%F %T'`
+ echo "start->${STARTTIME}" >> ${INFO_FILE}
+ line
+}
+
+init_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ print_date
+ echo ${INIT_RDB} >> ${LOGFILE}
+ ${INIT_RDB}
+ line
+ fi
+}
+
+update_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ print_date
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ line
+ ${UPDATE_RDB}
+ fi
+}
+results_report()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ print_date
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ line
+ ${RESULTS_REPORT}
+ fi
+}
+
+#-------------
# Run Tests
-###########################
-echo "Script -> ndbatomics-dd-tester.sh..."
-echo "Script -> ndbatomics-dd-tester.sh is running..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+#-------------
+
+header
load
-#----------Update Information file and INIT BM DB--------
-echo "name->${DB}-dd" >> ${INFO_FILE}
-echo "testType->PERFORMANCE" >> ${INFO_FILE}
-echo "tag->TPS" >> ${INFO_FILE}
-echo "dataType->float" >> ${INFO_FILE}
-echo "description->PERFORMANCE TESTING" >> ${INFO_FILE}
-echo "tr-description->ATOMICS TESTING" >> ${INFO_FILE}
-STARTTIME=`date +'%F %T'`
-echo "start->${STARTTIME}" >> ${INFO_FILE}
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${INIT_RDB} >> ${LOGFILE}
- ${INIT_RDB}
-fi
-line
-#------------------------------------------
+info_file_update
+init_bm
run
-#----------Update Information file and BM DB--------
end_time
-echo "exit->0" >> ${INFO_FILE}
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${UPDATE_RDB} >> ${LOGFILE}
- ${UPDATE_RDB}
-fi
-line
-#------------------------------------------
+update_bm
clean
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${RESULTS_REPORT} >> ${LOGFILE}
- ${RESULTS_REPORT}
-fi
-line
-print_date
echo "NDBT_ProgramExit: OK"
exit 0
=== added file 'drivers/ndbatomics-one-tester.sh'
--- a/drivers/ndbatomics-one-tester.sh 1970-01-01 00:00:00 +0000
+++ b/drivers/ndbatomics-one-tester.sh 2009-02-13 21:08:34 +0000
@@ -0,0 +1,235 @@
+#!/bin/bash
+#--------------------------------------------------------------------------------
+# This script is built to run under Cluster Replication Automation and is called
+# by ATRT once the master and slave clusters (including mysqld process) have been
+# started
+# acrt = automated cluster replication testing
+#--------------------------------------------------------------------------------
+
+#set -x
+#--------------------------------------------------------------------------------
+# Set X is for debugging. Should be commented out for runs or it will cause
+# test failure
+#--------------------------------------------------------------------------------
+
+OKAY="NDBT_ProgramExit: OK"
+FAILURE="NDBT_ProgramExit: Failed"
+
+#------------------
+# Load Config
+#------------------
+
+CONF=${1}
+if [ -f ${CONF} ]
+ then
+ . ${CONF}
+ else
+ echo "Load Config"
+ echo ${FAILURE}
+ exit 1
+fi
+
+#----------------
+# Set Variables
+#----------------
+
+DB=ndbatomics
+LINE="==========================================="
+#FILES/DIRS
+LOGFILE=${TESTCASE_LOG_DIR}/${DB}-dd.log
+PK_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.pk
+INFO_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.info
+CSV_FILE=${TESTCASE_LOG_DIR}/${DB}-dd.csv
+PERF_REPORT=${TESTCASE_LOG_DIR}/${DB}-dd.performance.rpt
+RF=${TESTCASE_LOG_DIR}/${DB}-dd.rpt
+NDBA_DIR=${TEST_SCRIPTS_DIR}/${DB}
+NDBA_SRC_DIR=${NDBA_DIR}/src
+DROP_DB=${NDBA_DIR}/dbCleanup.sql
+#NDBATOMICS
+TEST_RUN_TIME=300
+GROUP_OPS=900
+EXE=${NDBA_SRC_DIR}/NDBAtomics
+#LOAD
+NUMDATA=2
+NUMUNDO=1
+DATAFILESIZE="2G"
+UNDOSIZE="2000M"
+UNDOBUFFER="4M"
+LOAD_DB="${PERL} ${NDBA_DIR}/load_atomics.pl"
+NUMOFROWS=1000000
+
+#UPDATE_BM_DATABASE=""
+
+#Load database
+LOAD="${LOAD_DB} --port=${MASTER_PORT} -e ndbdd -d ${DB}"
+LOAD="${LOAD} --host=${MASTER} --user=root"
+LOAD="${LOAD} -numL ${NUMUNDO} --lfgFileSize=${UNDOSIZE}"
+LOAD="${LOAD} --numTSData=${NUMDATA} --tsFileSize=${DATAFILESIZE}"
+LOAD="${LOAD} --numAcc=${NUMOFROWS}"
+
+#Test Driver
+DRIVER="${EXE} -c ${NDB_MASTER}:${NDB_MASTER_PORT}"
+DRIVER="${DRIVER} --results ${RF}"
+DRIVER="${DRIVER} --cvs ${CSV_FILE}"
+DRIVER="${DRIVER} -g -n ${GROUP_OPS}"
+DRIVER="${DRIVER} -t ALL --timed ${TEST_RUN_TIME}"
+
+INIT_RDB="${INIT_RDB} -testN ${DB}-dd -pk ${PK_FILE} -l ${LOGFILE}"
+INIT_RDB="${INIT_RDB} -testP ${EXE} -testS ${DB}-dd-tester.sh"
+
+UPDATE_RDB="${UPDATE_RDB} -pkF ${PK_FILE} -res ${CSV_FILE} -info ${INFO_FILE}"
+UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
+
+RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFO_FILE} -re ${PERF_REPORT}"
+RESULTS_REPORT="${RESULTS_REPORT} --atomics"
+
+VERIFY="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER} -mpo ${MASTER_PORT} -vD ${DB}"
+VERIFY="${VERIFY} -l ${LOGFILE} --test=${DB}-dd -rdd --dropOnly -num 40"
+
+OPS_TIMER="${OPS_TIMER} --testName=ndbatomics-dd-tester"
+
+#---------------------
+# Script Functions
+#---------------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+end_time()
+{
+ ENDTIME=`date +'%F %T'`
+ echo "end->${ENDTIME}" >> ${INFO_FILE}
+ echo "exit->0" >> ${INFO_FILE}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+failed()
+{
+ print_date
+ echo "exit->1" >> ${INFO_FILE}
+ end_time
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ ${UPDATE_RDB}
+ fi
+ clean
+ echo $FAILURE
+ exit 1
+}
+
+load(){
+ line
+ echo "Script -> Calling Load..." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="LOAD ATOMICS DB"
+ ${LOAD}
+ RC=$?
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ echo "Script -> Load failed" >> ${LOGFILE}
+ failed
+ fi
+ ${OPS_TIMER} --end
+}
+
+run()
+{
+ line
+ print_date
+ echo "Script -> Running Test" >> ${LOGFILE}
+ ${DRIVER}
+ RC=$?
+ if [ ${RC} -ne 0 ]; then
+ echo "Script ->run failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ print_date
+ echo "Script -> Running Test" >> ${LOGFILE}
+}
+
+clean()
+{
+ line
+ echo "Script -> Dropping database.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="DROP DB & DD"
+ ${VERIFY}
+ ${OPS_TIMER} --end
+}
+
+header()
+{
+ print_date
+ echo "Script -> ndbatomics-dd-tester.sh..."
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> ndbatomics-dd-tester.sh is running..." > ${LOGFILE}
+ line
+}
+
+info_file_update()
+{
+ echo "Updating Information file" >> ${LOGFILE}
+ echo "name->${DB}-dd" >> ${INFO_FILE}
+ echo "testType->PERFORMANCE" >> ${INFO_FILE}
+ echo "tag->TPS" >> ${INFO_FILE}
+ echo "dataType->float" >> ${INFO_FILE}
+ echo "description->PERFORMANCE TESTING" >> ${INFO_FILE}
+ echo "tr-description->ATOMICS TESTING" >> ${INFO_FILE}
+ STARTTIME=`date +'%F %T'`
+ echo "start->${STARTTIME}" >> ${INFO_FILE}
+ line
+}
+
+init_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ print_date
+ echo ${INIT_RDB} >> ${LOGFILE}
+ ${INIT_RDB}
+ line
+ fi
+}
+
+update_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ print_date
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ line
+ ${UPDATE_RDB}
+ fi
+}
+results_report()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ print_date
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ line
+ ${RESULTS_REPORT}
+ fi
+}
+
+#-------------
+# Run Tests
+#-------------
+
+header
+load
+info_file_update
+init_bm
+run
+end_time
+update_bm
+clean
+echo "NDBT_ProgramExit: OK"
+exit 0
+
+#End of script
=== modified file 'drivers/ndbatomics-tester.sh'
--- a/drivers/ndbatomics-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/ndbatomics-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,36 +1,38 @@
#!/bin/bash
-################################################################################
+#-------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#-------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#-------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#-------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#---------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#---------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-#########################
+#----------------
# Set Variables
-#########################
+#----------------
+
DB=ndbatomics
LOGFILE=${TESTCASE_LOG_DIR}/${DB}.log
PK_FILE=${TESTCASE_LOG_DIR}/${DB}.pk
@@ -69,104 +71,150 @@ UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFO_FILE} -re ${PERF_REPORT}"
RESULTS_REPORT="${RESULTS_REPORT} --atomics"
-line(){
+OPS_TIMER="${OPS_TIMER} --testName=ndbatomics-tester"
+
+#------------------
+# Script Functions
+#------------------
+
+line()
+{
echo ${LINE} >> ${LOGFILE}
}
-end_time(){
+end_time()
+{
ENDTIME=`date +'%F %T'`
echo "end->${ENDTIME}" >> ${INFO_FILE}
+ echo "exit->0" >> ${INFO_FILE}
}
-print_date(){
+print_date()
+{
line
date >> ${LOGFILE}
line
}
-failed(){
+failed()
+{
print_date
echo "exit->1" >> ${INFO_FILE}
end_time
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
${UPDATE_RDB}
fi
- echo $FAILURE
+ echo ${FAILURE}
exit 1
}
-load(){
+load()
+{
line
echo "Script -> Calling Load..." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="LOAD NDBATOMICS DB"
${LOAD}
RC=$?
if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
echo "Script -> Load failed" >> ${LOGFILE}
failed
fi
+ ${OPS_TIMER} --end
}
-run(){
- line
+run()
+{
+ print_date
echo "Script -> Running Test" >> ${LOGFILE}
${DRIVER}
RC=$?
if [ ${RC} -ne 0 ]; then
- echo "Script ->run failed!!!!!" >> $LOGFILE
+ echo "Script ->run failed!!!!!" >> ${LOGFILE}
failed
fi
+ print_date
+ echo "Script -> Run Complete " >> ${LOGFILE}
}
-clean(){
+clean()
+{
line
echo "Script -> Dropping database.." >> ${LOGFILE}
- MYSQL_MASTER < ${DROP_DB} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --testOp="DROP DB NDBATOMICS"
+ $MYSQL_MASTER < ${DROP_DB} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --end
+}
+
+header()
+{
+ print_date
+ echo "Script -> ndbatomics-tester.sh..."
+ echo "Script -> ndbatomics-tester.sh is running..." > ${LOGFILE}
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+}
+
+update_info()
+{
+ echo "name->${DB}" >> ${INFO_FILE}
+ echo "testType->PERFORMANCE" >> ${INFO_FILE}
+ echo "tag->TPS" >> ${INFO_FILE}
+ echo "dataType->float" >> ${INFO_FILE}
+ echo "description->PERFORMANCE TESTING" >> ${INFO_FILE}
+ echo "tr-description->ATOMICS TESTING" >> ${INFO_FILE}
+ STARTTIME=`date +'%F %T'`
+ echo "start->${STARTTIME}" >> ${INFO_FILE}
+ line
+}
+
+init_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${INIT_RDB} >> ${LOGFILE}
+ line
+ ${INIT_RDB}
+ fi
+}
+
+update_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ line
+ ${UPDATE_RDB}
+ fi
+}
+
+results_rpt()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ line
+ ${RESULTS_REPORT}
+ fi
+}
+
+finish()
+{
+ line
+ print_date
+ echo "NDBT_ProgramExit: OK"
+ exit 0
}
-############################
+#------------
# Run Tests
-###########################
-echo "Script -> ndbatomics-tester.sh..."
-echo "Script -> ndbatomics-tester.sh is running..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+#------------
+
+header
load
-#----------Update Information file and INIT BM DB--------
-echo "name->${DB}" >> ${INFO_FILE}
-echo "testType->PERFORMANCE" >> ${INFO_FILE}
-echo "tag->TPS" >> ${INFO_FILE}
-echo "dataType->float" >> ${INFO_FILE}
-echo "description->PERFORMANCE TESTING" >> ${INFO_FILE}
-echo "tr-description->ATOMICS TESTING" >> ${INFO_FILE}
-STARTTIME=`date +'%F %T'`
-echo "start->${STARTTIME}" >> ${INFO_FILE}
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${INIT_RDB} >> ${LOGFILE}
- ${INIT_RDB}
-fi
-line
-#------------------------------------------
+update_info
+init_bm
run
-#----------Update Information file and BM DB--------
end_time
-echo "exit->0" >> ${INFO_FILE}
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${UPDATE_RDB} >> ${LOGFILE}
- ${UPDATE_RDB}
-fi
-line
-#------------------------------------------
clean
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${RESULTS_REPORT} >> ${LOGFILE}
- ${RESULTS_REPORT}
-fi
-line
-print_date
-echo "NDBT_ProgramExit: OK"
-exit 0
+finish
+#-------------
#End of script
+#-------------
=== modified file 'drivers/restore-rep-tester.sh'
--- a/drivers/restore-rep-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/restore-rep-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,231 +1,288 @@
#!/bin/bash
-################################################################################
+#-------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#-------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#-------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#-------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#--------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#--------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-#########################
+#------------------
# Set Variables
-#########################
+#------------------
+
USER=root
-LOGFILE=$TESTCASE_LOG_DIR/restorer-rep.log
-SQL_LOG=$TEST_TMP_DIR/sql.log
-NDB_RESTORE_LOG=$TEST_TMP_DIR/restorer.log
-JOINS_DIR=$TEST_SCRIPTS_DIR/joinAtomics
-JOINS_DATA_DIR=$TEST_SCRIPTS_DIR/joinAtomics/data
+LOGFILE=${TESTCASE_LOG_DIR}/restorer-rep.log
+SQL_LOG=${TEST_TMP_DIR}/sql.log
+NDB_RESTORE_LOG=${TEST_TMP_DIR}/restorer.log
+JOINS_DIR=${TEST_SCRIPTS_DIR}/joinAtomics
+JOINS_DATA_DIR=${TEST_SCRIPTS_DIR}/joinAtomics/data
DB=joins
LINE="==========================================="
# DATA Command
-EXTRACT_TEST_DATA="$EXTRACT_DATA $JOINS_DATA_DIR"
+EXTRACT_TEST_DATA="${EXTRACT_DATA} ${JOINS_DATA_DIR}"
#RESTORES
-MASTER_RESTORE_WM_N2=" -c $NDB_MASTER:$NDB_MASTER_PORT -n 2 -b 1 -m \
- -r $JOINS_DATA_DIR/"
-MASTER_RESTORE_N2=" -c $NDB_MASTER:$NDB_MASTER_PORT -n 2 -b 1 -r $JOINS_DATA_DIR/"
-MASTER_RESTORE_N3=" -c $NDB_MASTER:$NDB_MASTER_PORT -n 3 -b 1 -r $JOINS_DATA_DIR/"
-SLAVE_RESTORE_WM_N2=" -c $NDB_SLAVE:$NDB_SLAVE_PORT -n 2 -b 1 -m \
- -e -r $JOINS_DATA_DIR/"
-SLAVE_RESTORE_N2=" -c $NDB_SLAVE:$NDB_SLAVE_PORT -n 2 -b 1 -e -r $JOINS_DATA_DIR/"
-SLAVE_RESTORE_N3=" -c $NDB_SLAVE:$NDB_SLAVE_PORT -n 3 -b 1 -e -r $JOINS_DATA_DIR/"
+MASTER_RESTORE_WM_N2=" -c ${NDB_MASTER}:${NDB_MASTER_PORT} -n 2 -b 1 -m \
+ -r ${JOINS_DATA_DIR}/"
+MASTER_RESTORE_N2=" -c ${NDB_MASTER}:${NDB_MASTER_PORT} -n 2 -b 1 -r ${JOINS_DATA_DIR}/"
+MASTER_RESTORE_N3=" -c ${NDB_MASTER}:${NDB_MASTER_PORT} -n 3 -b 1 -r ${JOINS_DATA_DIR}/"
+SLAVE_RESTORE_WM_N2=" -c ${NDB_SLAVE}:${NDB_SLAVE_PORT} -n 2 -b 1 -m \
+ -e -r ${JOINS_DATA_DIR}/"
+SLAVE_RESTORE_N2=" -c ${NDB_SLAVE}:${NDB_SLAVE_PORT} -n 2 -b 1 -e -r ${JOINS_DATA_DIR}/"
+SLAVE_RESTORE_N3=" -c ${NDB_SLAVE}:${NDB_SLAVE_PORT} -n 3 -b 1 -e -r ${JOINS_DATA_DIR}/"
#SQL
-CREATE_DB=$JOINS_DIR/dbCreate.sql
-CREATE_TABLES=$JOINS_DIR/joins_tables.sql
-SHOW_TABLES=$JOINS_DIR/showTables.sql
-INSERTS=$JOINS_DIR/inserts.sql
+CREATE_DB=${JOINS_DIR}/dbCreate.sql
+CREATE_TABLES=${JOINS_DIR}/joins_tables.sql
+SHOW_TABLES=${JOINS_DIR}/showTables.sql
+INSERTS=${JOINS_DIR}/inserts.sql
#Wait for Master and slave Ready
-WFSQLR="$PERL $WAIT_FOR_READY --log=$LOGFILE --mpo $MASTER_PORT"
-WFSQLR="$WFSQLR --spo $SLAVE_PORT --mho $MASTER --sho $SLAVE"
+WFSQLR="${PERL} ${WAIT_FOR_READY} --log=${LOGFILE} --mpo ${MASTER_PORT}"
+WFSQLR="${WFSQLR} --spo ${SLAVE_PORT} --mho ${MASTER} --sho ${SLAVE}"
-VERIFY="$PERL $SLAVE_VERIFICATION -mho $MASTER -sho $SLAVE"
-VERIFY="$VERIFY -mpo $MASTER_PORT -spo $SLAVE_PORT -vD $DB --verifyDrop"
-VERIFY="$VERIFY -bin $INSTALL_BIN_DIR -log $LOGFILE --test=restore -f $TEST_TMP_DIR"
-
-DROP="$PERL $SLAVE_VERIFICATION -mho $MASTER "
-DROP="$DROP -mpo $MASTER_PORT -vD $DB --dropOnly"
-DROP="$DROP -bin $INSTALL_BIN_DIR -log $LOGFILE --test=restore -f $TEST_TMP_DIR"
-
-SLAVE_STARTER="$PERL $SLAVE_RESET"
-SLAVE_STARTER="$SLAVE_STARTER -mho $MASTER -sho $SLAVE -mu root -su root"
-SLAVE_STARTER="$SLAVE_STARTER -mpo $MASTER_PORT -spo $SLAVE_PORT"
-SLAVE_STARTER="$SLAVE_STARTER -log $LOGFILE"
-
-wait_for_master_slave_ready(){
-echo $LINE >> $LOGFILE
-$WFSQLR
-RC=$?
-if [ ${RC} -ne 0 ]
- then
- echo "Script -> wait for sql ready failed" >> $LOGFILE
- echo $FAILURE
+VERIFY="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER} -sho ${SLAVE}"
+VERIFY="${VERIFY} -mpo ${MASTER_PORT} -spo ${SLAVE_PORT} -vD ${DB} --verifyDrop"
+VERIFY="${VERIFY} -bin ${INSTALL_BIN_DIR} -log ${LOGFILE} --test=restore -f ${TEST_TMP_DIR}"
+
+DROP="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER} "
+DROP="${DROP} -mpo ${MASTER_PORT} -vD ${DB} --dropOnly"
+DROP="${DROP} -bin ${INSTALL_BIN_DIR} -log ${LOGFILE} --test=restore -f ${TEST_TMP_DIR}"
+
+SLAVE_STARTER="${PERL} ${SLAVE_RESET}"
+SLAVE_STARTER="${SLAVE_STARTER} -mho ${MASTER} -sho ${SLAVE} -mu root -su root"
+SLAVE_STARTER="${SLAVE_STARTER} -mpo ${MASTER_PORT} -spo ${SLAVE_PORT}"
+SLAVE_STARTER="${SLAVE_STARTER} -log ${LOGFILE}"
+
+OPS_TIMER="${OPS_TIMER} --testName=restore-rep-tester"
+
+#----------------------
+# Script Functions
+#----------------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+wait_for_master_slave_ready()
+{
+ line
+ ${WFSQLR}
+ RC=$?
+ if [ ${RC} -ne 0 ];then
+ echo "Script -> wait for sql ready failed" >> ${LOGFILE}
+ echo ${FAILURE}
exit 1
-fi
-echo "Script -> Master & Slave reset and ready" >> $LOGFILE
-}
-
-data_extractor(){
-echo $LINE >> $LOGFILE
-echo "Script -> Extract Data..." >> $LOGFILE
-$EXTRACT_TEST_DATA >> $LOGFILE
-echo $LINE >> $LOGFILE
-}
-
-check_sql(){
-cat $SQL_LOG >> $LOGFILE
-ERR_COUNT=`grep -i error $SQL_LOG |wc -l`
-if [ ${ERR_COUNT} -ne 0 ];then
- rm $SQL_LOG
- echo "Script -> SQL failed!" >> $LOGFILE
- echo $FAILURE
- exit 1
-fi
-rm $SQL_LOG
-}
-
-check_restore(){
-echo $LINE >> $LOGFILE
-echo "Script -> Checking Restore.." >> $LOGFILE
-ERR_COUNT=`grep -i fail $NDB_RESTORE_LOG |wc -l`
-cat $NDB_RESTORE_LOG >> $LOGFILE
-if [ ${ERR_COUNT} -ne 0 ];then
- rm $NDB_RESTORE_LOG
- echo "NDB Restore $FAILURE"
- $FAILURE
- exit 1
-fi
-rm $NDB_RESTORE_LOG
-}
-
-insert_data_master(){
-echo $LINE >> $LOGFILE
-echo "Script -> Insert data on master.." >> $LOGFILE
-MYSQL_MASTER < $INSERTS >> $SQL_LOG 2>&1
-check_sql
-}
-
-
-create_db_master(){
-echo $LINE >> $LOGFILE
-echo "Script -> Create Database on master.." >> $LOGFILE
-MYSQL_MASTER < $CREATE_DB >> $SQL_LOG 2>&1
-check_sql
-}
-
-create_db_slave(){
-echo $LINE >> $LOGFILE
-echo "Script -> Create Database on slave.." >> $LOGFILE
-MYSQL_SLAVE < $CREATE_DB >> $SQL_LOG 2>&1
-check_sql
-}
-
-create_tables_master(){
-echo $LINE >> $LOGFILE
-echo "Script -> Creating Tables on Master.." >> $LOGFILE
-MYSQL_MASTER < $CREATE_TABLES >> $SQL_LOG 2>&1
-check_sql
+ fi
+ echo "Script -> Master & Slave reset and ready" >> ${LOGFILE}
}
-create_tables_slave(){
-echo $LINE >> $LOGFILE
-echo "Script -> Creating Tables on Slave.." >> $LOGFILE
-MYSQL_SLAVE < $CREATE_TABLES >> $SQL_LOG 2>&1
-check_sql
-}
-
-show_tables_master(){
-echo $LINE >> $LOGFILE
-echo "Script -> Show Tables Master..." >> $LOGFILE
-MYSQL_MASTER < $SHOW_TABLES >> $LOGFILE 2>&1
-}
-
-show_tables_slave(){
-echo $LINE >> $LOGFILE
-echo "Script -> Show Tables Slave..." >> $LOGFILE
-MYSQL_SLAVE < $SHOW_TABLES >> $LOGFILE 2>&1
-}
-
-restore_master_metadata(){
-echo $LINE >> $LOGFILE
-echo "Script -> Restore Master data w/ metadata.." >> $LOGFILE
-$NDB_RESTORE $MASTER_RESTORE_WM_N2 >> $NDB_RESTORE_LOG 2>&1
-$NDB_RESTORE $MASTER_RESTORE_N3 >> $NDB_RESTORE_LOG 2>&1
-}
-
-restore_master_data(){
-echo $LINE >> $LOGFILE
-echo "Script -> Restore Master Data.." >> $LOGFILE
-$NDB_RESTORE $MASTER_RESTORE_N2 >> $NDB_RESTORE_LOG 2>&1
-$NDB_RESTORE $MASTER_RESTORE_N3 >> $NDB_RESTORE_LOG 2>&1
-}
-
-restore_slave_metadata(){
-echo $LINE >> $LOGFILE
-echo "Script -> Restore Slave data w/ metadata.." >> $LOGFILE
-$NDB_RESTORE $SLAVE_RESTORE_WM_N2 >> $NDB_RESTORE_LOG 2>&1
-$NDB_RESTORE $SLAVE_RESTORE_N3 >> $NDB_RESTORE_LOG 2>&1
+data_extractor()
+{
+ line
+ echo "Script -> Extract Data..." >> ${LOGFILE}
+ ${EXTRACT_TEST_DATA} >> ${LOGFILE}
+ line
+}
+
+check_sql()
+{
+ cat ${SQL_LOG} >> ${LOGFILE}
+ ERR_COUNT=`grep -i error ${SQL_LOG} |wc -l`
+ if [ ${ERR_COUNT} -ne 0 ];then
+ rm ${SQL_LOG}
+ echo "Script -> SQL failed!" >> ${LOGFILE}
+ ${MYSQL_MASTER} -e "SHOW ERRORS;" >> ${LOGFILE} 2>&1
+ echo ${FAILURE}
+ exit 1
+ fi
+ rm ${SQL_LOG}
}
-restore_slave_data(){
-echo $LINE >> $LOGFILE
-echo "Script -> Restore Slave Data.." >> $LOGFILE
-$NDB_RESTORE $SLAVE_RESTORE_N2 >> $NDB_RESTORE_LOG 2>&1
-$NDB_RESTORE $SLAVE_RESTORE_N3 >> $NDB_RESTORE_LOG 2>&1
+check_restore()
+{
+ line
+ echo "Script -> Checking Restore.." >> ${LOGFILE}
+ ERR_COUNT=`grep -i fail ${NDB_RESTORE_LOG} |wc -l`
+ cat ${NDB_RESTORE_LOG} >> ${LOGFILE}
+ if [ ${ERR_COUNT} -ne 0 ];then
+ rm ${NDB_RESTORE_LOG}
+ echo "NDB Restore ${FAILURE}"
+ ${FAILURE}
+ exit 1
+ fi
+ rm ${NDB_RESTORE_LOG}
}
-drop_db(){
-echo $LINE >> $LOGFILE
-echo "Script -> Droping DB" >> $LOGFILE
-$DROP
-RC=$?
-if [ ${RC} -ne 0 ];then
- echo "Script -> Drop DB Failed ..." >> $LOGFILE
- echo $FAILURE
- exit 1
-fi
-echo "Script -> Verifed Slave!.." >> $LOGFILE
+insert_data_master()
+{
+ line
+ echo "Script -> Insert data on master.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="Data Insert Master"
+ ${MYSQL_MASTER} < ${INSERTS} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+}
+
+create_db_master()
+{
+ line
+ echo "Script -> Create Database on master.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE DB MASTER"
+ ${MYSQL_MASTER} < ${CREATE_DB} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+}
+
+create_db_slave()
+{
+ line
+ echo "Script -> Create Database on slave.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE DB SLAVE"
+ ${MYSQL_SLAVE} < ${CREATE_DB} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+}
+
+create_tables_master()
+{
+ line
+ echo "Script -> Creating Tables on Master.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE TABLES MASTER"
+ ${MYSQL_MASTER} < ${CREATE_TABLES} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+}
+
+create_tables_slave()
+{
+ line
+ echo "Script -> Creating Tables on Slave.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE TABLES SLAVE"
+ ${MYSQL_SLAVE} < ${CREATE_TABLES} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+}
+
+show_tables_master()
+{
+ line
+ echo "Script -> Show Tables Master..." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="SHOW TABLES MASTER"
+ ${MYSQL_MASTER} < ${SHOW_TABLES} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --end
+}
+
+show_tables_slave()
+{
+ line
+ echo "Script -> Show Tables Slave..." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="SHOW TABLES SLAVE"
+ ${MYSQL_SLAVE} < ${SHOW_TABLES} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --end
+}
+
+restore_master_metadata()
+{
+ line
+ echo "Script -> Restore Master data w/ metadata.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="NDB RESTORE METADATA MASTER"
+ ${NDB_RESTORE} ${MASTER_RESTORE_WM_N2} >> ${NDB_RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${MASTER_RESTORE_N3} >> ${NDB_RESTORE_LOG} 2>&1
+ ${OPS_TIMER} --end
+}
+
+restore_master_data()
+{
+ line
+ echo "Script -> Restore Master Data.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="NDB RESTORE DATA MASTER"
+ ${NDB_RESTORE} ${MASTER_RESTORE_N2} >> ${NDB_RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${MASTER_RESTORE_N3} >> ${NDB_RESTORE_LOG} 2>&1
+ ${OPS_TIMER} --end
+}
+
+restore_slave_metadata()
+{
+ line
+ echo "Script -> Restore Slave data w/ metadata.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="NDB RESTORE METADATA SLAVE"
+ ${NDB_RESTORE} ${SLAVE_RESTORE_WM_N2} >> ${NDB_RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${SLAVE_RESTORE_N3} >> ${NDB_RESTORE_LOG} 2>&1
+ ${OPS_TIMER} --end
+}
+
+restore_slave_data()
+{
+ line
+ echo "Script -> Restore Slave Data.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="NDB RESTORE DATA SLAVE"
+ ${NDB_RESTORE} ${SLAVE_RESTORE_N2} >> ${NDB_RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${SLAVE_RESTORE_N3} >> ${NDB_RESTORE_LOG} 2>&1
+ ${OPS_TIMER} --end
+}
+
+drop_db()
+{
+ line
+ echo "Script -> Droping DB" >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="DROP DATABASE"
+ ${DROP}
+ ${OPS_TIMER} --end
+ RC=${?}
+ if [ ${RC} -ne 0 ];then
+ echo "Script -> Drop DB Failed ..." >> ${LOGFILE}
+ echo ${FAILURE}
+ exit 1
+ fi
+ echo "Script -> Verifed Slave!.." >> ${LOGFILE}
}
-verify_slave(){
-echo $LINE >> $LOGFILE
-echo "Script -> Verifying Slave.." >> $LOGFILE
-$VERIFY --database $DB --tables="t7"
-RC=$?
-if [ ${RC} -ne 0 ];then
- echo "Script -> Slave out of sync ..." >> $LOGFILE
- echo $FAILURE
- exit 1
-fi
-echo "Script -> Verifed Slave!.." >> $LOGFILE
+verify_slave()
+{
+ line
+ echo "Script -> Verifying Slave.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="SYNC SLAVE"
+ ${VERIFY} --database ${DB} --tables="t7"
+ RC=$?
+ if [ ${RC} -ne 0 ];then
+ ${OPS_TIMER} --end
+ echo "Script -> Slave out of sync ..." >> ${LOGFILE}
+ echo ${FAILURE}
+ exit 1
+ fi
+ ${OPS_TIMER} --end
+ echo "Script -> Verifed Slave!.." >> ${LOGFILE}
}
-remove_data(){
+remove_data()
+{
PWD=`pwd`
cd ${JOINS_DATA_DIR}
rm -f *.Data
@@ -236,24 +293,33 @@ remove_data(){
echo "Script -> Data files removed..." >> ${LOGFILE}
}
-############################
-# Run Tests
-###########################
-#echo "restore-tester.sh"
-echo "Script -> restore-tester.sh is running..." > $LOGFILE
-echo $LINE >> $LOGFILE
-date >> $LOGFILE
+print_date()
+{
+ line
+ date >> $LOGFILE
+ line
+}
+
+header()
+{
+ print_date
+ echo "Script -> Configuration file has been loaded..." >> $LOGFILE
+ echo "restore-tester.sh"
+ echo "Script -> restore-tester.sh is running..." > $LOGFILE
+}
-echo $LINE >> $LOGFILE
-echo "Script -> Configuration file has been loaded..." >> $LOGFILE
+#-----------
+# Run Tests
+#-----------
+header
wait_for_master_slave_ready
data_extractor
-echo $LINE >> $LOGFILE
-echo "Test #1 of Restore: This test creates a database name" >> $LOGFILE
-echo " on the server, then uses the ndb restore to restore" >> $LOGFILE
-echo " the meta data and the actual data and verifies slave." >> $LOGFILE
+line
+echo "Test #1 of Restore: This test creates a database name" >> ${LOGFILE}
+echo " on the server, then uses the ndb restore to restore" >> ${LOGFILE}
+echo " the meta data and the actual data and verifies slave." >> ${LOGFILE}
create_db_master
show_tables_master
@@ -263,10 +329,10 @@ show_tables_master
drop_db
wait_for_master_slave_ready
-echo $LINE >> $LOGFILE
-echo "Test #2 of Restore: This test uses SQL to creates" >> $LOGFILE
-echo " a database name & tables on the server and then uses ndb" >> $LOGFILE
-echo " restore to restore actual data." >> $LOGFILE
+line
+echo "Test #2 of Restore: This test uses SQL to creates" >> ${LOGFILE}
+echo " a database name & tables on the server and then uses ndb" >> ${LOGFILE}
+echo " restore to restore actual data." >> ${LOGFILE}
create_db_master
create_tables_master
@@ -331,17 +397,14 @@ wait_for_master_slave_ready
#insert_data_master
#verify_slave
-
-echo $LINE >> $LOGFILE
-echo "Script -> Remove Data Files ..." >> $LOGFILE
+line
remove_data
-echo $LINE >> $LOGFILE
+print_date
echo "Script -> Restore Test Complete" >> $LOGFILE
-echo $LINE >> $LOGFILE
-date >> $LOGFILE
-echo $LINE >> $LOGFILE
+line
echo "NDBT_ProgramExit: OK"
-sleep 3
exit 0
+#--------------
#End of script
+#--------------
=== modified file 'drivers/restore-tester.sh'
--- a/drivers/restore-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/restore-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,23 +1,24 @@
#!/bin/bash
-################################################################################
+#-------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#-------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#-------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#-------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#--------------
# Load Config
-#################
+#--------------
+
CONF=${1}
if [ -f ${CONF} ]
then
@@ -28,9 +29,10 @@ if [ -f ${CONF} ]
exit 1
fi
-#########################
+#--------------
# Set Variables
-#########################
+#--------------
+
USER=root
LOGFILE=${TESTCASE_LOG_DIR}/restorer.log
RPTFILE=${TESTCASE_LOG_DIR}/restorer-verify.log
@@ -56,91 +58,123 @@ DROP_DB=${TEST_SCRIPTS_DIR}/joinAtomics/
CREATE_TABLES=${TEST_SCRIPTS_DIR}/joinAtomics/joins_tables.sql
SHOW_TABLES=${TEST_SCRIPTS_DIR}/joinAtomics/showTables.sql
-line(){
-echo ${LINE} >> ${LOGFILE}
-}
-
-data_extractor(){
-line
-echo "Script -> Extract Data..." >> ${LOGFILE}
-${EXTRACT_TEST_DATA}
-line
-}
-
-failed(){
-print_date
-echo ${FAILURE}
-exit 1
-}
+#Timer
+OPS_TIMER="${OPS_TIMER} --testName=RESTORE-TEST"
-check_sql(){
-cat ${SQL_LOG} >> ${LOGFILE}
-COUNT=`grep -i error ${SQL_LOG} |wc -l`
-if [ ${COUNT} -ne 0 ];then
+#------------------
+# Script Functions
+#------------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+data_extractor()
+{
+ line
+ echo "Script -> Extract Data..." >> ${LOGFILE}
+ ${EXTRACT_TEST_DATA}
+ line
+}
+
+failed()
+{
+ print_date
+ echo ${FAILURE}
+ exit 1
+}
+
+check_sql()
+{
+ cat ${SQL_LOG} >> ${LOGFILE}
+ COUNT=`grep -i error ${SQL_LOG} |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ rm ${SQL_LOG}
+ echo "Script -> SQL failed!" >> ${LOGFILE}
+ ${MYSQL_MASTER} -e "SHOW ERRORS;" >> ${LOGFILE} 2>&1
+ failed
+ fi
rm ${SQL_LOG}
- echo "Script -> SQL failed!" >> ${LOGFILE}
- failed
-fi
-rm ${SQL_LOG}
}
-check_restore(){
-line
-echo "Script -> Checking Restore.." >> ${LOGFILE}
-cat ${NDB_RESTORE_LOG} >> ${LOGFILE}
-COUNT=`grep -i fail ${NDB_RESTORE_LOG} |wc -l`
-if [ ${COUNT} -ne 0 ];then
+check_restore()
+{
+ line
+ echo "Script -> Checking Restore.." >> ${LOGFILE}
+ cat ${NDB_RESTORE_LOG} >> ${LOGFILE}
+ COUNT=`grep -i fail ${NDB_RESTORE_LOG} |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ rm ${NDB_RESTORE_LOG}
+ echo "NDB Restore ${FAILURE}"
+ failed
+ fi
rm ${NDB_RESTORE_LOG}
- echo "NDB Restore ${FAILURE}"
- failed
-fi
-rm ${NDB_RESTORE_LOG}
-}
-
-create_db_master(){
-line
-echo "Script -> Create Database on master.." >> ${LOGFILE}
-MYSQL_MASTER < ${CREATE_DB} >> ${SQL_LOG} 2>&1
-check_sql
-}
-
-drop_db_master(){
-line
-echo "Script -> Drop Database on master.." >> ${LOGFILE}
-MYSQL_MASTER < ${DROP_DB} >> ${SQL_LOG} 2>&1
-check_sql
}
-create_tables_master(){
-line
-echo "Script -> Creating Tables on Master.." >> ${LOGFILE}
-MYSQL_MASTER < ${CREATE_TABLES} >> ${SQL_LOG} 2>&1
-check_sql
-}
-
-show_tables_master(){
-line
-echo "Script -> Show Tables Master..." >> ${LOGFILE}
-MYSQL_MASTER < ${SHOW_TABLES} >> ${LOGFILE} 2>&1
-}
-
-restore_master_metadata(){
-line
-echo "Script -> Restore Master data w/ metadata.." >> ${LOGFILE}
-${NDB_RESTORE} ${MASTER_RESTORE_WM_N2} >> ${NDB_RESTORE_LOG} 2>&1
-${NDB_RESTORE} ${MASTER_RESTORE_N3} >> ${NDB_RESTORE_LOG} 2>&1
-}
-
-restore_master_data(){
-line
-echo "Script -> Restore Master Data.." >> ${LOGFILE}
-${NDB_RESTORE} ${MASTER_RESTORE_N2} >> ${NDB_RESTORE_LOG} 2>&1
-${NDB_RESTORE} ${MASTER_RESTORE_N3} >> ${NDB_RESTORE_LOG} 2>&1
-}
-
-remove_data(){
-line
-echo "Script -> Remove Data Files ..." >> ${LOGFILE}
+create_db_master()
+{
+ line
+ echo "Script -> Create Database on master.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE DB"
+ ${MYSQL_MASTER} < ${CREATE_DB} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+}
+
+drop_db_master()
+{
+ line
+ echo "Script -> Drop Database on master.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="DROP DB"
+ ${MYSQL_MASTER} < ${DROP_DB} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+}
+
+create_tables_master()
+{
+ line
+ echo "Script -> Creating Tables on Master.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE TABLES"
+ ${MYSQL_MASTER} < ${CREATE_TABLES} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+}
+
+show_tables_master()
+{
+ line
+ echo "Script -> Show Tables Master..." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="SHOW TABLES"
+ ${MYSQL_MASTER} < ${SHOW_TABLES} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --end
+}
+
+restore_master_metadata()
+{
+ line
+ echo "Script -> Restore Master data w/ metadata.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="RESTORE ALL"
+ ${NDB_RESTORE} ${MASTER_RESTORE_WM_N2} >> ${NDB_RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${MASTER_RESTORE_N3} >> ${NDB_RESTORE_LOG} 2>&1
+ ${OPS_TIMER} --end
+}
+
+restore_master_data()
+{
+ line
+ echo "Script -> Restore Master Data.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="RESTORE DATA ONLY"
+ ${NDB_RESTORE} ${MASTER_RESTORE_N2} >> ${NDB_RESTORE_LOG} 2>&1
+ ${NDB_RESTORE} ${MASTER_RESTORE_N3} >> ${NDB_RESTORE_LOG} 2>&1
+ ${OPS_TIMER} --end
+}
+
+remove_data()
+{
+ line
+ echo "Script -> Remove Data Files ..." >> ${LOGFILE}
PWD=`pwd`
cd ${JOINS_DATA_DIR}
rm -f *.Data
@@ -151,22 +185,35 @@ echo "Script -> Remove Data Files ..." >
echo "Script -> Data files removed..." >> ${LOGFILE}
}
-print_date(){
-line
-date >> ${LOGFILE}
-line
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+header()
+{
+ print_date
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "restore-tester.sh"
+ echo "Script -> restore-tester.sh is running..." > ${LOGFILE}
+}
+
+finish()
+{
+ remove_data
+ print_date
+ echo "Script -> Restore Test Complete" >> ${LOGFILE}
+ echo "NDBT_ProgramExit: OK"
+ exit 0
}
-
-
-############################
+#------------
# Run Tests
-###########################
-echo "restore-tester.sh"
-echo "Script -> restore-tester.sh is running..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
-line
+#------------
+
+header
data_extractor
line
echo "Test #1 of Restore: This test creates a database name " >> ${LOGFILE}
@@ -192,11 +239,8 @@ check_restore
show_tables_master
drop_db_master
-remove_data
-line
-echo "Script -> Restore Test Complete" >> ${LOGFILE}
-print_date
-echo "NDBT_ProgramExit: OK"
-exit 0
+finish
+#-------------
#End of script
+#-------------
=== modified file 'drivers/sony-tester.sh'
--- a/drivers/sony-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/sony-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,23 +1,24 @@
#!/bin/bash
-################################################################################
+#-------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#-------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#-------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#-------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#-------------
# Load Config
-#################
+#-------------
+
CONF=${1}
if [ -f ${CONF} ]
then
@@ -28,159 +29,188 @@ if [ -f ${CONF} ]
exit 1
fi
-#########################
+#---------------
# Set Variables
-#########################
+#---------------
+
USER=root
SDB=sony
-LOGFILE=$TESTCASE_LOG_DIR/$SDB.log
-SQL_LOG=$TEST_TMP_DIR/sony-sql.log
-SONY_REPORT=$TESTCASE_LOG_DIR/$SDB.rpt
-SONY_PLAN_REPORT=$TESTCASE_LOG_DIR/$SDB.explain
-SONY_DIR=$TEST_SCRIPTS_DIR/cge
-SQL_DIR=$SONY_DIR/sql/$SDB
-MAIN_DATA=$SONY_DIR/data
-DATA=$MAIN_DATA/$SDB
+LOGFILE=${TESTCASE_LOG_DIR}/${SDB}.log
+SQL_LOG=${TEST_TMP_DIR}/sony-sql.log
+SONY_REPORT=${TESTCASE_LOG_DIR}/${SDB}.rpt
+SONY_PLAN_REPORT=${TESTCASE_LOG_DIR}/${SDB}.explain
+SONY_DIR=${TEST_SCRIPTS_DIR}/cge
+SQL_DIR=${SONY_DIR}/sql/${SDB}
+MAIN_DATA=${SONY_DIR}/data
+DATA=${MAIN_DATA/$SDB}
INTERATIONS=100
CONNECTIONS_1=1
CONNECTIONS_2=10
LINE="==========================================="
-SONY_PLAN="$SONY_DIR/sony_plans.sh --log $SONY_PLAN_REPORT"
-PLAN_ARGS="--client-path $INSTALL_BIN_DIR"
-PLAN_ARGS2="--host $MASTER --port $MASTER_PORT"
+SONY_PLAN="${SONY_DIR}/sony_plans.sh --log ${SONY_PLAN_REPORT}"
+PLAN_ARGS="--client-path ${INSTALL_BIN_DIR}"
+PLAN_ARGS2="--host ${MASTER} --port ${MASTER_PORT}"
# SONY SQL
-SONY_QUERY=$SQL_DIR/SONY_query.sql
-SONY_NO_BLOB_QUERY=$SQL_DIR/SONY_query_no_blob.sql
-SONY_CREATE_DB=$SQL_DIR/createDB.sql
-SONY_CLEAN_UP=$SQL_DIR/dbCleanup.sql
+SONY_QUERY=${SQL_DIR}/SONY_query.sql
+SONY_NO_BLOB_QUERY=${SQL_DIR}/SONY_query_no_blob.sql
+SONY_CREATE_DB=${SQL_DIR}/createDB.sql
+SONY_CLEAN_UP=${SQL_DIR}/dbCleanup.sql
#Load databases
-LOAD_DB_ARGS="$DATA/mobile3-data.sql"
-LOAD_DB_ARGS2="$DATA/rundatastore3-daa.sql"
+LOAD_DB_ARGS="${DATA}/mobile3-data.sql"
+LOAD_DB_ARGS2="${DATA}/rundatastore3-daa.sql"
#Run sc Queries
-SLAP_C1="$SLAP -c $CONNECTIONS_1"
-SLAP_C2="$SLAP -c $CONNECTIONS_2"
-SLAP_ARGS=" -h $MASTER -P $MASTER_PORT -i $INTERATIONS -u $USER"
-SONY_RUN_1=" --query=$SONY_QUERY --create-schema=$SDB"
-SONY_RUN_2=" --query=$SONY_NO_BLOB_QUERY --create-schema=$SDB"
-
-line(){
-echo ${LINE} >> ${LOGFILE}
-}
-
-s_line(){
-echo ${LINE} >> ${SONY_REPORT}
-}
-
-print_date(){
-line
-date >> ${LOGFILE}
-line
-}
-
-failed(){
-print_date
-remove_data
-echo ${FAILURE} >> ${LOGFILE}
-echo ${FAILURE}
-exit 1
-}
-
-check_sql(){
-cat ${SQL_LOG} >> ${LOGFILE}
-COUNT=`grep -i error ${SQL_LOG} |wc -l`
-COUNT2=`grep -i fail ${SQL_LOG} |wc -l`
-if [ ${COUNT} -ne 0 ] ||
- [ ${COUNT2} -ne 0 ];then
+SLAP_C1="${SLAP} -c ${CONNECTIONS_1}"
+SLAP_C2="${SLAP} -c ${CONNECTIONS_2}"
+SLAP_ARGS=" -h ${MASTER} -P ${MASTER_PORT} -i ${INTERATIONS} -u ${USER}"
+SONY_RUN_1=" --query=${SONY_QUERY} --create-schema=${SDB}"
+SONY_RUN_2=" --query=${SONY_NO_BLOB_QUERY} --create-schema=${SDB}"
+
+OPS_TIMER="${OPS_TIMER} --testName=Sony"
+
+#---------------------
+# Script Functions
+#---------------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+s_line()
+{
+ echo ${LINE} >> ${SONY_REPORT}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+failed()
+{
+ print_date
+ remove_data
+ echo ${FAILURE} >> ${LOGFILE}
+ echo ${FAILURE}
+ exit 1
+}
+
+check_sql()
+{
+ cat ${SQL_LOG} >> ${LOGFILE}
+ COUNT=`grep -i error ${SQL_LOG} |wc -l`
+ COUNT2=`grep -i fail ${SQL_LOG} |wc -l`
+ if [ ${COUNT} -ne 0 ] ||
+ [ ${COUNT2} -ne 0 ];then
+ rm ${SQL_LOG}
+ echo "Script -> SQL failed!" >> ${LOGFILE}
+ ${MYSQL_MASTER} -e "SHOW ERRORS;" >> ${LOGFILE} 2>&1
+ failed
+ fi
rm ${SQL_LOG}
- echo "Script -> SQL failed!" >> ${LOGFILE}
- failed
-fi
-rm ${SQL_LOG}
}
-remove_data(){
-line
-echo "Script -> Removing Data.." >> ${LOGFILE}
-if [ -d "${CGE_DATA}/sc" ] || [ -d "${CGE_DATA}/sony" ] ||
- [ -d "${CGE_DATA}/np" ] ;then
- cd ${CGE_DATA}
- rm -rf *
-fi
-}
-
-create_db(){
-line
-echo "Script -> Creating sony Database.." >> ${LOGFILE}
-MYSQL_MASTER < ${SONY_CREATE_DB} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> sony Database Created.." >> ${LOGFILE}
-}
-
-data_extraction(){
-line
-echo "Script -> Extracting sony Data.." >> ${LOGFILE}
-${EXTRACT_DATA} ${MAIN_DATA} >> ${LOGFILE}
-echo "Script -> sony Data Extracted.." >> ${LOGFILE}
-}
-
-load_db(){
-line
-echo "Script -> Calling Load for sony.." >> ${LOGFILE}
-MYSQL_MASTER --database=${SDB} < ${LOAD_DB_ARGS} >> ${SQL_LOG} 2>&1
-check_sql
-MYSQL_MASTER --database=${SDB} < ${LOAD_DB_ARGS2} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> Load of sony DB Complete.." >> ${LOGFILE}
-}
-
-run_plan(){
-echo ${LINE} >> ${LOGFILE}
-echo "Script -> Calling PLAN for sony.." >> ${LOGFILE}
-${SONY_PLAN} ${PLAN_ARGS} ${PLAN_ARGS2}
-RC=$?
-echo "Script -> PLAN for sony had a return code of ${RC}.." >> ${LOGFILE}
-}
-
-drop_db(){
-line
-echo "Script -> Dropping Database" >> ${LOGFILE}
-MYSQL_MASTER < ${SONY_CLEAN_UP} >> ${SQL_LOG} 2>&1
-check_sql
-echo "Script -> Database Dropped" >> ${LOGFILE}
+remove_data()
+{
+ line
+ echo "Script -> Removing Data.." >> ${LOGFILE}
+ if [ -d "${CGE_DATA}/sc" ] || [ -d "${CGE_DATA}/sony" ] ||
+ [ -d "${CGE_DATA}/np" ] ;then
+ cd ${CGE_DATA}
+ rm -rf *
+ fi
+}
+
+create_db()
+{
+ line
+ echo "Script -> Creating sony Database.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE DB"
+ ${MYSQL_MASTER} < ${SONY_CREATE_DB} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+ echo "Script -> sony Database Created.." >> ${LOGFILE}
+}
+
+data_extraction()
+{
+ line
+ echo "Script -> Extracting sony Data.." >> ${LOGFILE}
+ ${EXTRACT_DATA} ${MAIN_DATA} >> ${LOGFILE}
+ echo "Script -> sony Data Extracted.." >> ${LOGFILE}
+}
+
+load_db()
+{
+ line
+ echo "Script -> Calling Load for sony.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="LOAD DB #1"
+ ${MYSQL_MASTER} --database=${SDB} < ${LOAD_DB_ARGS} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+ ${OPS_TIMER} --testOp="LOAD DB #2"
+ ${MYSQL_MASTER} --database=${SDB} < ${LOAD_DB_ARGS2} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+ echo "Script -> Load of sony DB Complete.." >> ${LOGFILE}
+}
+
+run_plan()
+{
+ echo ${LINE} >> ${LOGFILE}
+ echo "Script -> Calling PLAN for sony.." >> ${LOGFILE}
+ ${SONY_PLAN} ${PLAN_ARGS} ${PLAN_ARGS2}
+ RC=$?
+ echo "Script -> PLAN for sony had a return code of ${RC}.." >> ${LOGFILE}
+}
+
+drop_db()
+{
+ line
+ echo "Script -> Dropping Database" >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="DROP DB"
+ ${MYSQL_MASTER} < ${SONY_CLEAN_UP} >> ${SQL_LOG} 2>&1
+ ${OPS_TIMER} --end
+ check_sql
+ echo "Script -> Database Dropped" >> ${LOGFILE}
+}
+
+header()
+{
+ print_date
+ echo "sony-reg-tester.sh"
+ echo "Script -> sony-reg-tester.sh..." > ${LOGFILE}
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
}
-############################
+#------------
# Run Tests
-###########################
+#------------
-echo "sony-reg-tester.sh"
-echo "Script -> sony-reg-tester.sh..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+header
data_extraction
create_db
load_db
remove_data
run_plan
-
line
echo "Script -> Sony Query with BLOBS using $CONNECTIONS_1 connections.. " >> $LOGFILE
$SLAP_C1 $SLAP_ARGS $SONY_RUN_1 > $SONY_REPORT
s_line
echo " End of Query with blobs Connection(s) = $CONNECTIONS_1" >> $SONY_REPORT
s_line
-
line
echo "Script -> Sony Query with BLOBS using $CONNECTIONS_2 connections.. " >> $LOGFILE
$SLAP_C2 $SLAP_ARGS $SONY_RUN_1 >> $SONY_REPORT
s_line
echo " End of Query with blobs Connection(s) = $CONNECTIONS_2" >> $SONY_REPORT
s_line
-
line
echo "Script -> Sony Query without BLOBS using $CONNECTIONS_1 connections.. " >> $LOGFILE
$SLAP_C1 $SLAP_ARGS $SONY_RUN_2 >> $SONY_REPORT
=== modified file 'drivers/stress-tester.sh'
--- a/drivers/stress-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/stress-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,52 +1,44 @@
#!/bin/bash
-#######################################################
+#------------------------------------------------------
# This script is built to run under Cluster Replication
# Automation and is called by ATRT once the MASTER and
# SLAVE clusters (including mysqld process) have been
# started, acrt = automated cluster replication testing
-########################################################
+#------------------------------------------------------
-##########################################################
+#set -x
+#------------------------------------------------------
# Set X is for debugging. Should be commented out for runs
# or it will cause test failure
-############################################################
-#set -x
+#------------------------------------------------------
+
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
LINE="==========================================="
-#################
+#---------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#---------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-######################
+#-------------------
# Shell Variables
-######################
+#-------------------
-LOGFILE=$TESTCASE_LOG_DIR/stress.log
-#echo "stress-tester.sh"
-echo "Script -> stress-tester.sh is running..." > $LOGFILE
-echo $LINE >> $LOGFILE
-date >> $LOGFILE
-echo $LINE >> $LOGFILE
-echo "Script -> Configuration file has been loaded..." >> $LOGFILE
-echo $LINE >> $LOGFILE
-
-#########################
-# Set Additional Variables
-#########################
+LOGFILE=${TESTCASE_LOG_DIR}/stress.log
USER=root
-SQL_LOG=$TEST_TMP_DIR/sql.log
-NDB_RESTORE_LOG=$TEST_TMP_DIR/restorer.log
+SQL_LOG=${TEST_TMP_DIR}/sql.log
+NDB_RESTORE_LOG=${TEST_TMP_DIR}/restorer.log
+MASTER="${MYSQL} --host=${MASTER} -u root --protocol=tcp --port=${MASTER_PORT}"
#ATOMICS
ATOMICS_DB='ndbatomics'
@@ -65,9 +57,9 @@ ATOMICS_LOAD_CMD="${PERL} ${ATOMICS_DIR}
#TPCB
TPCB_DB=TPCB
-TPCB_DIR=$TEST_SCRIPTS_DIR/tpcb
-TPCB_RS_FILE=$TESTCASE_LOG_DIR/tpcb-stress.rpt
-CSVFILE=$TESTCASE_LOG_DIR/tpcb-stress.csv
+TPCB_DIR=${TEST_SCRIPTS_DIR}/tpcb
+TPCB_RS_FILE=${TESTCASE_LOG_DIR}/tpcb-stress.rpt
+CSVFILE=${TESTCASE_LOG_DIR}/tpcb-stress.csv
TEST_TIME=5250
#TEST_TIME=36000
NUMBER_OF_TESTS=4
@@ -75,30 +67,30 @@ TEST_MULTIPLIER=10
#TPCC
TPCC_DB=dbt2
-TPCC_DIR=$TEST_SCRIPTS_DIR/tpcc
-TPCC_DATA=$TPCC_DIR/data
-TPCC_REMOVE_DATA="rm $TPCC_DATA/*"
-TPCC_SP_PATH=$TPCC_DIR/$TPCC_DB/storedproc/mysql
+TPCC_DIR=${TEST_SCRIPTS_DIR}/tpcc
+TPCC_DATA=${TPCC_DIR}/data
+TPCC_REMOVE_DATA="rm ${TPCC_DATA}/*"
+TPCC_SP_PATH=${TPCC_DIR}/${TPCC_DB}/storedproc/mysql
TEST_RUN_TIME=21600
#TEST_RUN_TIME=147600
NUM_CONNECTIONS=15
NUM_WAREHOUSE=15
STACK_SIZE=512
-TPCC_SRC_DIR=$TPCC_DIR/$TPCC_DB/src
-KILL_CLIENT=$TPCC_DIR/kill_client.sh
+TPCC_SRC_DIR=${TPCC_DIR}/${TPCC_DB}/src
+KILL_CLIENT=${TPCC_DIR}/kill_client.sh
#JOIN
JOINS_DB=joins
-JOINS_LOGFILE=$TESTCASE_LOG_DIR/joins.log
-JOINS_SECOND_LOGFILE=$TESTCASE_LOG_DIR/joins_2.log
-JOINS_REPORT=$TESTCASE_LOG_DIR/joins-stress.rpt
-JOINS_EXE=$INSTALL_BIN_DIR/JoinsTest
-JOINS_DATA_DIR=$TEST_SCRIPTS_DIR/joinAtomics/data
+JOINS_LOGFILE=${TESTCASE_LOG_DIR}/joins.log
+JOINS_SECOND_LOGFILE=${TESTCASE_LOG_DIR}/joins_2.log
+JOINS_REPORT=${TESTCASE_LOG_DIR}/joins-stress.rpt
+JOINS_EXE=${INSTALL_BIN_DIR}/JoinsTest
+JOINS_DATA_DIR=${TEST_SCRIPTS_DIR}/joinAtomics/data
JOINS_TEST='J7'
JOINS_TIME=21000
#JOINS_TIME=126000
-JOINS_EXTRACT_DATA="$EXTRACT_DATA $JOINS_DATA_DIR"
-JOINS_REMOVE_DATA="rm $JOINS_DATA_DIR/*"
+JOINS_EXTRACT_DATA="${EXTRACT_DATA} ${JOINS_DATA_DIR}"
+JOINS_REMOVE_DATA="rm ${JOINS_DATA_DIR}/*"
### COMMAND VARIABLES ###
@@ -114,183 +106,211 @@ ATOMICS_DRIVER2="${ATOMICS_DRIVER2} -t $
ATOMICS_DRIVER="${ATOMICS_DRIVER} -t ${ATOMICS_TEST} --timed ${ATOMICS_RUN_TIME}"
#TPCB
-LOAD_TPCB="$PERL $TPCB_DIR/tpcb_load_db.pl"
-LOAD_TPCB="$LOAD_TPCB --port=$MASTER_PORT --host=$MASTER"
-LOAD_TPCB="$LOAD_TPCB --log=$LOGFILE"
-
-TPCB_DRIVER="$PERL $TPCB_DIR/tpcbSql_driver.pl"
-TPCB_DRIVER="$TPCB_DRIVER --log=$TPCB_RS_FILE --port=$MASTER_PORT"
-TPCB_DRIVER="$TPCB_DRIVER --host=$MASTER -r $TESTCASE_LOG_DIR"
-TPCB_DRIVER="$TPCB_DRIVER --work=$TPCB_DIR -tt $TEST_TIME"
-TPCB_DRIVER="$TPCB_DRIVER -nt $NUMBER_OF_TESTS -tm $TEST_MULTIPLIER -sp"
-TPCB_DRIVER="$TPCB_DRIVER --cvs=$CSVFILE"
+LOAD_TPCB="${PERL} ${TPCB_DIR}/tpcb_load_db.pl"
+LOAD_TPCB="${LOAD_TPCB} --port=${MASTER_PORT} --host=${MASTER}"
+LOAD_TPCB="${LOAD_TPCB} --log=${LOGFILE}"
+
+TPCB_DRIVER="${PERL} ${TPCB_DIR}/tpcbSql_driver.pl"
+TPCB_DRIVER="${TPCB_DRIVER} --log=${TPCB_RS_FILE} --port=${MASTER_PORT}"
+TPCB_DRIVER="${TPCB_DRIVER} --host=${MASTER} -r ${TESTCASE_LOG_DIR}"
+TPCB_DRIVER="${TPCB_DRIVER} --work=${TPCB_DIR} -tt ${TEST_TIME}"
+TPCB_DRIVER="${TPCB_DRIVER} -nt ${NUMBER_OF_TESTS} -tm ${TEST_MULTIPLIER} -sp"
+TPCB_DRIVER="${TPCB_DRIVER} --cvs=${CSVFILE}"
#TPCC
#Create data to load into dbt2
-TPCC_DATAGEN="$TPCC_SRC_DIR/datagen"
-TPCC_DATAGEN="$TPCC_DATAGEN -w $NUM_WAREHOUSE --mysql -d $TPCC_DATA"
+TPCC_DATAGEN="${TPCC_SRC_DIR}/datagen"
+TPCC_DATAGEN="${TPCC_DATAGEN} -w ${NUM_WAREHOUSE} --mysql -d ${TPCC_DATA}"
#Load dbt2 database
-LOAD_TPCC="$TPCC_DIR/mysql_load_db.sh"
-LOAD_TPCC="$LOAD_TPCC --path $TPCC_DATA --port $MASTER_PORT"
-LOAD_TPCC="$LOAD_TPCC --host $MASTER --user $USER"
-LOAD_TPCC="$LOAD_TPCC --mysql-path $INSTALL_BIN_DIR/mysql"
-LOAD_TPCC="$LOAD_TPCC --using-hash --engine NDB --log $LOGFILE"
+LOAD_TPCC="${TPCC_DIR}/mysql_load_db.sh"
+LOAD_TPCC="${LOAD_TPCC} --path ${TPCC_DATA} --port ${MASTER_PORT}"
+LOAD_TPCC="${LOAD_TPCC} --host ${MASTER} --user ${USER}"
+LOAD_TPCC="${LOAD_TPCC} --mysql-path ${INSTALL_BIN_DIR}/mysql"
+LOAD_TPCC="${LOAD_TPCC} --using-hash --engine NDB --log ${LOGFILE}"
#Load Stored Procedures
-LOAD_SP="$TPCC_DIR/mysql_load_sp.sh"
-LOAD_SP="$LOAD_SP --host $MASTER --port $MASTER_PORT"
-LOAD_SP="$LOAD_SP --user $USER --log $LOGFILE"
-LOAD_SP="$LOAD_SP --client-path $INSTALL_BIN_DIR"
-LOAD_SP="$LOAD_SP --sp-path $TPCC_SP_PATH"
+LOAD_SP="${TPCC_DIR}/mysql_load_sp.sh"
+LOAD_SP="${LOAD_SP} --host ${MASTER} --port ${MASTER_PORT}"
+LOAD_SP="${LOAD_SP} --user ${USER} --log ${LOGFILE}"
+LOAD_SP="${LOAD_SP} --client-path ${INSTALL_BIN_DIR}"
+LOAD_SP="${LOAD_SP} --sp-path ${TPCC_SP_PATH}"
#TPCC Test Driver
-TPCC_DRIVER="$TPCC_DIR/run_mysql.sh"
-TPCC_DRIVER="$TPCC_DRIVER --connections $NUM_CONNECTIONS"
-TPCC_DRIVER="$TPCC_DRIVER --time $TEST_RUN_TIME"
-TPCC_DRIVER="$TPCC_DRIVER --warehouses $NUM_WAREHOUSE"
-TPCC_DRIVER="$TPCC_DRIVER --log-file $LOGFILE"
-TPCC_DRIVER="$TPCC_DRIVER --stack-size $STACK_SIZE"
-TPCC_DRIVER="$TPCC_DRIVER --lib-client-path $INSTALL_LIB_DIR"
-TPCC_DRIVER="$TPCC_DRIVER --log-dir $TESTCASE_LOG_DIR"
-TPCC_DRIVER="$TPCC_DRIVER --host $MASTER --port $MASTER_PORT"
-TPCC_DRIVER="$TPCC_DRIVER --test-path $TPCC_DIR/$TPCC_DB --zero-delay"
+TPCC_DRIVER="${TPCC_DIR}/run_mysql.sh"
+TPCC_DRIVER="${TPCC_DRIVER} --connections ${NUM_CONNECTIONS}"
+TPCC_DRIVER="${TPCC_DRIVER} --time ${TEST_RUN_TIME}"
+TPCC_DRIVER="${TPCC_DRIVER} --warehouses ${NUM_WAREHOUSE}"
+TPCC_DRIVER="${TPCC_DRIVER} --log-file ${LOGFILE}"
+TPCC_DRIVER="${TPCC_DRIVER} --stack-size ${STACK_SIZE}"
+TPCC_DRIVER="${TPCC_DRIVER} --lib-client-path ${INSTALL_LIB_DIR}"
+TPCC_DRIVER="${TPCC_DRIVER} --log-dir ${TESTCASE_LOG_DIR}"
+TPCC_DRIVER="${TPCC_DRIVER} --host ${MASTER} --port ${MASTER_PORT}"
+TPCC_DRIVER="${TPCC_DRIVER} --test-path ${TPCC_DIR}/${TPCC_DB} --zero-delay"
#joins
-LOAD_JOINS_DB_1="-c $NDB_MASTER:$NDB_MASTER_PORT -n 2 -b 1 -r"
-LOAD_JOINS_DB_1="$LOAD_JOINS_DB_1 --backup_path $JOINS_DATA_DIR/"
-LOAD_JOINS_DB_2="-c $NDB_MASTER:$NDB_MASTER_PORT -n 3 -b 1 -r"
-LOAD_JOINS_DB_2="$LOAD_JOINS_DB_2 --backup_path $JOINS_DATA_DIR/"
-
-JOINS_MASTER="--host $MASTER --user $USER --port $MASTER_PORT"
-JOINS_MASTER="$JOINS_MASTER --results $JOINS_REPORT"
-JOINS_MASTER="$JOINS_MASTER --test $JOINS_TEST --timed $JOINS_TIME"
-JOINS_MASTER="$JOINS_MASTER --no-create-db"
-
-CHECK_JOINS="--mpo $MASTER_PORT --spo $SLAVE_PORT --mho $MASTER"
-CHECK_JOINS="$CHECK_JOINS --sho $SLAVE --log=$LOGFILE"
-CHECK_JOINS="$CHECK_JOINS --database=$JOINS_DB --table=t8"
-
-CREATE_JOINS_DB=$TEST_SCRIPTS_DIR/joinAtomics/joins_tables.sql
-DROP_JOINS_DB=$TEST_SCRIPTS_DIR/joinAtomics/dbCleanup.sql
-
-DROP="$PERL $SLAVE_VERIFICATION -mho $MASTER "
-DROP="$DROP -mpo $MASTER_PORT --dropOnly"
-DROP="$DROP -bin $INSTALL_BIN_DIR -log $LOGFILE --test=restore -f $TEST_TMP_DIR"
+LOAD_JOINS_DB_1="-c ${NDB_MASTER}:${NDB_MASTER_PORT} -n 2 -b 1 -r"
+LOAD_JOINS_DB_1="${LOAD_JOINS_DB_1} --backup_path ${JOINS_DATA_DIR}/"
+LOAD_JOINS_DB_2="-c ${NDB_MASTER}:${NDB_MASTER_PORT} -n 3 -b 1 -r"
+LOAD_JOINS_DB_2="${LOAD_JOINS_DB_2} --backup_path ${JOINS_DATA_DIR}/"
+
+JOINS_MASTER="--host ${MASTER} --user ${USER} --port ${MASTER_PORT}"
+JOINS_MASTER="${JOINS_MASTER} --results ${JOINS_REPORT}"
+JOINS_MASTER="${JOINS_MASTER} --test ${JOINS_TEST} --timed ${JOINS_TIME}"
+JOINS_MASTER="${JOINS_MASTER} --no-create-db"
+
+CHECK_JOINS="--mpo ${MASTER_PORT} --spo ${SLAVE_PORT} --mho ${MASTER}"
+CHECK_JOINS="${CHECK_JOINS} --sho ${SLAVE} --log=${LOGFILE}"
+CHECK_JOINS="${CHECK_JOINS} --database=${JOINS_DB} --table=t8"
+
+CREATE_JOINS_DB=${TEST_SCRIPTS_DIR}/joinAtomics/joins_tables.sql
+DROP_JOINS_DB=${TEST_SCRIPTS_DIR}/joinAtomics/dbCleanup.sql
+
+DROP="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER}"
+DROP="$DROP -mpo ${MASTER_PORT} --dropOnly"
+DROP="$DROP -bin ${INSTALL_BIN_DIR} -log ${LOGFILE} --test=stress -f ${TEST_TMP_DIR}"
### Sub Functions ###
-check_sql(){
-cat $SQL_LOG >> $LOGFILE
-if [ `grep -i error $SQL_LOG |wc -l` != 0 ];then
- rm $SQL_LOG
- echo "Script -> SQL failed!" >> $LOGFILE
- echo $FAILURE
- exit 1
-fi
-rm $SQL_LOG
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
}
-check_restore(){
-echo $LINE >> $LOGFILE
-echo "Script -> Checking Restore.." >> $LOGFILE
-cat $NDB_RESTORE_LOG >> $LOGFILE
-if [ `grep -i fail $NDB_RESTORE_LOG |wc -l` != 0 ];then
- rm $NDB_RESTORE_LOG
- echo "NDB Restore $FAILURE"
- $FAILURE
- exit 1
-fi
-rm $NDB_RESTORE_LOG
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
}
-prepare_data(){
- echo $LINE >> $LOGFILE
- echo "Script -> Creating DBT2 data for load.." >> $LOGFILE
- $TPCC_DATAGEN >> $LOGFILE
- echo $LINE >> $LOGFILE
- echo "Script -> Extracting joins data for load.." >> $LOGFILE
- $JOINS_EXTRACT_DATA
+header()
+{
+ print_date
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "stress-tester.sh"
+ echo "Script -> stress-tester.sh is running..." > ${LOGFILE}
+}
+
+check_sql()
+{
+ cat ${SQL_LOG} >> ${LOGFILE}
+ if [ `grep -i error ${SQL_LOG} |wc -l` != 0 ];then
+ rm ${SQL_LOG}
+ echo "Script -> SQL failed!" >> ${LOGFILE}
+ ${MYSQL_MASTER} -e "SHOW ERRORS;" >> ${LOGFILE} 2>&1
+ echo ${FAILURE}
+ exit 1
+ fi
+ rm ${SQL_LOG}
+}
+
+check_restore()
+{
+ line
+ echo "Script -> Checking Restore.." >> ${LOGFILE}
+ cat ${NDB_RESTORE_LOG} >> ${LOGFILE}
+ if [ `grep -i fail ${NDB_RESTORE_LOG} |wc -l` != 0 ];then
+ rm ${NDB_RESTORE_LOG}
+ echo "NDB Restore ${FAILURE}"
+ ${FAILURE}
+ exit 1
+ fi
+ rm ${NDB_RESTORE_LOG}
+}
+
+prepare_data()
+{
+ line
+ echo "Script -> Creating DBT2 data for load.." >> ${LOGFILE}
+ ${TPCC_DATAGEN} >> ${LOGFILE}
+ line
+ echo "Script -> Extracting joins data for load.." >> ${LOGFILE}
+ ${JOINS_EXTRACT_DATA}
}
## Load Databases ##
-load_atomics(){
- echo ${LINE} >> ${LOGFILE}
- echo "Script -> Calling Load ${ATOMICS_DB}.." >> $LOGFILE
- $LOAD_ATOMICS_DB >> $LOGFILE
+load_atomics()
+{
+ line
+ echo "Script -> Calling Load ${ATOMICS_DB}.." >> ${LOGFILE}
+ ${LOAD_ATOMICS_DB} >> ${LOGFILE}
}
-load_tpcb(){
- echo ${LINE} >> ${LOGFILE}
- echo "Script -> Calling Load TPCB.." >> $LOGFILE
- $LOAD_TPCB >> $LOGFILE
+load_tpcb()
+{
+ line
+ echo "Script -> Calling Load TPCB.." >> ${LOGFILE}
+ ${LOAD_TPCB} >> ${LOGFILE}
}
-load_tpcc(){
- echo ${LINE} >> ${LOGFILE}
- echo "Script -> Calling Load TPCC.." >> $LOGFILE
- if [ `$LOAD_TPCC` -ne 0 ]
+load_tpcc()
+{
+ line
+ echo "Script -> Calling Load TPCC.." >> ${LOGFILE}
+ if [ `${LOAD_TPCC}` != 0 ]
then
- echo "Script -> Load failed" >> $LOGFILE
- echo $FAILURE
+ echo "Script -> Load failed" >> ${LOGFILE}
+ echo ${FAILURE}
exit 1
fi
- echo ${LINE} >> ${LOGFILE}
-
- echo "Script -> Loading TPCC Store Procedures.." >> $LOGFILE
- if [ `$LOAD_SP` -ne 0 ]
+ line
+ echo "Script -> Loading TPCC Store Procedures.." >> ${LOGFILE}
+ if [ `${LOAD_SP}` != 0 ]
then
- echo "Script -> Load SP failed" >> $LOGFILE
- echo $FAILURE
+ echo "Script -> Load SP failed" >> ${LOGFILE}
+ echo ${FAILURE}
exit 1
fi
-
- $TPCC_REMOVE_DATA
+ ${TPCC_REMOVE_DATA}
}
-load_joins(){
- echo ${LINE} >> ${LOGFILE}
- echo "Script -> Loading Joins Database.." >> $LOGFILE
- MYSQL_MASTER < $CREATE_JOINS_DB >> $SQL_LOG 2>&1
+load_joins()
+{
+ line
+ echo "Script -> Loading Joins Database.." >> ${LOGFILE}
+ ${MASTER} < ${CREATE_JOINS_DB} >> ${SQL_LOG} 2>&1
check_sql
- $NDB_RESTORE $LOAD_JOINS_DB_1 >> $NDB_RESTORE_LOG 2>&1
+ ${NDB_RESTORE} ${LOAD_JOINS_DB_1} >> ${NDB_RESTORE_LOG} 2>&1
check_restore
- $NDB_RESTORE $LOAD_JOINS_DB_2 >> $NDB_RESTORE_LOG 2>&1
+ ${NDB_RESTORE} ${LOAD_JOINS_DB_2} >> ${NDB_RESTORE_LOG} 2>&1
check_restore
- $JOINS_REMOVE_DATA
+ ${JOINS_REMOVE_DATA}
}
-run_test(){
+run_test()
+{
## Start Stress Testing ##
- echo $LINE >> $LOGFILE
- echo "Script ->Stress test running" >> $LOGFILE
- echo $LINE >> $LOGFILE
- date >> $LOGFILE
- echo $LINE >> $LOGFILE
- echo "Script -> Running Joins Tests.... " >> $LOGFILE
- nohup ${JOINS_EXE} ${JOINS_MASTER} >> $JOINS_LOGFILE &
- nohup ${JOINS_EXE} ${JOINS_MASTER} >> $JOINS_SECOND_LOGFILE &
- echo "Script -> Running Atomics Tests.... " >> $LOGFILE
- nohup ${ATOMICS_DRIVER} >> $LOGFILE &
- nohup ${ATOMICS_DRIVER2} >> $LOGFILE &
- echo "Script -> Running TPC-B Tests.... " >> $LOGFILE
- nohup $TPCB_DRIVER &
- echo "Script -> Running TPC-C Tests.... " >> $LOGFILE
- $TPCC_DRIVER
- echo $LINE >> $LOGFILE
-}
-
- cleanup(){
- echo $LINE >> $LOGFILE
- echo "Script -> Dropping Databases... " >> $LOGFILE
- $DROP -vD $ATOMICS_DB >> $LOGFILE 2>&1
- $DROP -vD $JOINS_DB >> $LOGFILE 2>&1
- $DROP -vD $TPCB_DB >> $LOGFILE 2>&1
- $DROP -vD $TPCC_DB >> $LOGFILE 2>&1
+ print_date
+ echo "Script ->Stress test running" >> ${LOGFILE}
+ line
+ echo "Script -> Running Joins Tests.... " >> ${LOGFILE}
+ nohup ${JOINS_EXE} ${JOINS_MASTER} >> ${JOINS_LOGFILE} &
+ nohup ${JOINS_EXE} ${JOINS_MASTER} >> ${JOINS_SECOND_LOGFILE} &
+ echo "Script -> Running Atomics Tests.... " >> ${LOGFILE}
+ nohup ${ATOMICS_DRIVER} >> ${LOGFILE} &
+ nohup ${ATOMICS_DRIVER2} >> ${LOGFILE} &
+ echo "Script -> Running TPC-B Tests.... " >> ${LOGFILE}
+ nohup ${TPCB_DRIVER} &
+ echo "Script -> Running TPC-C Tests.... " >> ${LOGFILE}
+ ${TPCC_DRIVER}
+ line
+}
+
+cleanup()
+{
+ line
+ echo "Script -> Dropping Databases... " >> ${LOGFILE}
+ ${DROP} -vD ${ATOMICS_DB} >> ${LOGFILE} 2>&1
+ ${DROP} -vD ${JOINS_DB} >> ${LOGFILE} 2>&1
+ ${DROP} -vD ${TPCB_DB} >> ${LOGFILE} 2>&1
+ ${DROP} -vD ${TPCC_DB} >> ${LOGFILE} 2>&1
}
#############
# Run Tests #
#############
+ header
prepare_data
load_atomics
load_tpcb
@@ -298,11 +318,8 @@ run_test(){
load_joins
run_test
cleanup
- echo $LINE >> $LOGFILE
- date >> $LOGFILE
- echo $LINE >> $LOGFILE
+ print_date
echo "NDBT_ProgramExit: OK"
- sleep 3
exit 0
=== modified file 'drivers/sysbench-oltp-tester.sh'
--- a/drivers/sysbench-oltp-tester.sh 2008-10-30 23:41:52 +0000
+++ b/drivers/sysbench-oltp-tester.sh 2009-02-13 21:08:34 +0000
@@ -63,7 +63,8 @@ INIT_RDB="$INIT_RDB -testN sysbench -l $
INIT_RDB="$INIT_RDB -testP $SYS_BENCH -testS $DB_DRIVER"
# TEST ARGS
-ARGS="--debug -t $SB_WRAPPER -y $TEST_HOST_STRING"
+#ARGS="--debug -t $SB_WRAPPER -y $TEST_HOST_STRING"
+ARGS="-t $SB_WRAPPER -y $TEST_HOST_STRING"
ARGS="$ARGS -m '$DSTAT_CMD'"
ARGS="$ARGS -l '$LDSTAT_CMD'"
ARGS="$ARGS -a $PK_LOG -g $SB_EXEC"
=== modified file 'drivers/tpcb-perl-tester.sh'
--- a/drivers/tpcb-perl-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/tpcb-perl-tester.sh 2009-02-13 21:08:34 +0000
@@ -98,7 +98,7 @@ failed(){
remove_data(){
line
echo "Script -> Dropping TPCB database.." >> $LOGFILE
-MYSQL_MASTER < ${DROP_DB} >> ${LOGFILE} 2>&1
+$MYSQL_MASTER < ${DROP_DB} >> ${LOGFILE} 2>&1
}
load_database(){
=== modified file 'drivers/tpcb-rep-tester.sh'
--- a/drivers/tpcb-rep-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/tpcb-rep-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,24 +1,25 @@
#!/bin/bash
-################################################################################
+#------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the MASTER and SLAVE clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
PWD=`pwd`
-#################
+#---------------
# Load Config
-#################
+#---------------
+
CONF=${1}
if [ -f ${CONF} ]
then
@@ -29,26 +30,26 @@ if [ -f ${CONF} ]
exit 1
fi
-#########################
+#---------------
# Set Variables
-#########################
-LOGFILE=$TESTCASE_LOG_DIR/tpcb-rep.log
-CSVFILE=$TESTCASE_LOG_DIR/tpcb.csv
-TPCB_DIR=$TEST_SCRIPTS_DIR/tpcb
-RESULTSFILE=$TESTCASE_LOG_DIR/tpcb-rep.rpt
+#---------------
+LOGFILE=${TESTCASE_LOG_DIR}/tpcb-rep.log
+CSVFILE=${TESTCASE_LOG_DIR}/tpcb.csv
+TPCB_DIR=${TEST_SCRIPTS_DIR}/tpcb
+RESULTSFILE=${TESTCASE_LOG_DIR}/tpcb-rep.rpt
LINE="==========================================="
-WFSQLR="$PERL $WAIT_FOR_READY"
-WFSQLR="$WFSQLR --log=$LOGFILE --mpo $MASTER_PORT"
-WFSQLR="$WFSQLR --spo $SLAVE_PORT --mho $MASTER --sho $SLAVE"
-
-LOAD_TPCB="$PERL $TPCB_DIR/tpcb_load_db.pl"
-LOAD_TPCB="$LOAD_TPCB --port=$MASTER_PORT --host=$MASTER --log=$LOGFILE"
-
-LOAD_CHECK="$PERL $CHECK_LOAD"
-LOAD_CHECK="$LOAD_CHECK --mpo $MASTER_PORT --spo $SLAVE_PORT"
-LOAD_CHECK="$LOAD_CHECK --mho $MASTER --sho $SLAVE --log=$LOGFILE"
-LOAD_CHECK="$LOAD_CHECK --database TPCB --table account"
+WFSQLR="${PERL} ${WAIT_FOR_READY}"
+WFSQLR="${WFSQLR} --log=${LOGFILE} --mpo ${MASTER_PORT}"
+WFSQLR="${WFSQLR} --spo ${SLAVE_PORT} --mho ${MASTER} --sho ${SLAVE}"
+
+LOAD_TPCB="${PERL} ${TPCB_DIR}/tpcb_load_db.pl"
+LOAD_TPCB="${LOAD_TPCB} --port=${MASTER_PORT} --host=${MASTER} --log=${LOGFILE}"
+
+LOAD_CHECK="${PERL} ${CHECK_LOAD}"
+LOAD_CHECK="${LOAD_CHECK} --mpo ${MASTER_PORT} --spo ${SLAVE_PORT}"
+LOAD_CHECK="${LOAD_CHECK} --mho ${MASTER} --sho ${SLAVE} --log=${LOGFILE}"
+LOAD_CHECK="${LOAD_CHECK} --database TPCB --table account"
TPCB_DRIVER="${PERL} ${TPCB_DIR}/tpcbSql_driver.pl"
TPCB_DRIVER="${TPCB_DRIVER} --log=${RESULTSFILE} --port=${MASTER_PORT}"
@@ -56,103 +57,135 @@ TPCB_DRIVER="${TPCB_DRIVER} --cvs=${CSVF
TPCB_DRIVER="${TPCB_DRIVER} --host=${MASTER} -r ${TESTCASE_LOG_DIR}/"
TPCB_DRIVER="${TPCB_DRIVER} --work=${TPCB_DIR} -tt 120 -nt 6 -tm 4"
-VERIFY="$PERL $SLAVE_VERIFICATION"
-VERIFY="$VERIFY -mho $MASTER -sho $SLAVE -mpo $MASTER_PORT"
-VERIFY="$VERIFY -spo $SLAVE_PORT -vD TPCB"
-VERIFY="$VERIFY -bin $INSTALL_BIN_DIR -log $LOGFILE"
-VERIFY="$VERIFY --test=tpcb -f $TESTCASE_LOG_DIR --verifyDrop"
-
-############################
-# Run Tests
-###########################
-
-line(){
-echo ${LINE} >> ${LOGFILE}
-}
-
-print_date(){
-line
-date >> ${LOGFILE}
-line
-}
-
-failed(){
-print_date
-echo ${FAILURE} >> ${LOGFILE}
-echo ${FAILURE}
-exit 1
-}
-
-wait_for_sql_ready(){
-line
-echo "Script -> Calling Wait for SQL ready..." >> ${LOGFILE}
-${WFSQLR}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> wait for sql ready failed" >> ${LOGFILE}
- failed
-fi
-echo "Script -> wait for sql ready passed" >> ${LOGFILE}
+VERIFY="${PERL} ${SLAVE_VERIFICATION}"
+VERIFY="${VERIFY} -mho ${MASTER} -sho ${SLAVE} -mpo ${MASTER_PORT}"
+VERIFY="${VERIFY} -spo ${SLAVE_PORT} -vD TPCB"
+VERIFY="${VERIFY} -bin ${INSTALL_BIN_DIR} -log ${LOGFILE}"
+VERIFY="${VERIFY} --test=tpcb -f ${TESTCASE_LOG_DIR} --verifyDrop"
+
+OPS_TIMER="${OPS_TIMER} --testName=TPC-B-REP"
+
+#----------------
+# Script Function
+#----------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+failed()
+{
+ print_date
+ echo ${FAILURE} >> ${LOGFILE}
+ echo ${FAILURE}
+ exit 1
+}
+
+wait_for_sql_ready()
+{
+ line
+ echo "Script -> Calling Wait for SQL ready..." >> ${LOGFILE}
+ ${WFSQLR}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> wait for sql ready failed" >> ${LOGFILE}
+ failed
+ fi
+ echo "Script -> wait for sql ready passed" >> ${LOGFILE}
+}
+
+load_db()
+{
+ line
+ echo "Script -> Calling Load TPCB.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="LOAD DB"
+ ${LOAD_TPCB} >> ${LOGFILE}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ echo "Script -> load failed" >> ${LOGFILE}
+ failed
+ fi
+ ${OPS_TIMER} --end
+ echo "Script -> db loaded...." >> ${LOGFILE}
+}
+
+check_load()
+{
+ line
+ echo "Script -> Calling Check load.. " >> ${LOGFILE}
+ ${LOAD_CHECK}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load check failed" >> ${LOGFILE}
+ failed
+ fi
+ echo "Script -> Load check done" >> ${LOGFILE}
+}
+
+run_test()
+{
+ line
+ echo "Script -> Calling TPCB Driver, tests running" >> ${LOGFILE}
+ ${TPCB_DRIVER}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> TPCB Runs failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ echo "Script -> TPCB Tests have completed... " >> ${LOGFILE}
+}
+
+slave_verification()
+{
+ line
+ echo "Script -> Verifing that SLAVE is in sysnc.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="VERIFY SLAVE & DROP DB"
+ ${VERIFY} --tables="account branch teller history"
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ echo "Script -> Verify failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ ${OPS_TIMER} --end
+}
+
+header()
+{
+ print_date
+ echo "tpcb-rep-tester.sh"
+ echo "Script -> tpcb-rep-tester.sh is running..." > ${LOGFILE}
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+}
+
+finish()
+{
+ print_date
+ echo "NDBT_ProgramExit: OK"
+ exit 0
}
-load_db(){
-line
-echo "Script -> Calling Load TPCB.." >> ${LOGFILE}
-$LOAD_TPCB >> $LOGFILE
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> load failed" >> ${LOGFILE}
- failed
-fi
-echo "Script -> db loaded...." >> ${LOGFILE}
-}
-
-check_load(){
-line
-echo "Script -> Calling Check load.. " >> ${LOGFILE}
-${LOAD_CHECK}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load check failed" >> ${LOGFILE}
- failed
-fi
-echo "Script -> Load check done" >> ${LOGFILE}
-}
-
-run_test(){
-line
-echo "Script -> Calling TPCB Driver, tests running" >> ${LOGFILE}
-${TPCB_DRIVER}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> TPCB Runs failed!!!!!" >> ${LOGFILE}
- failed
-fi
-echo "Script -> TPCB Tests have completed... " >> ${LOGFILE}
-}
-
-slave_verification(){
-line
-echo "Script -> Verifing that SLAVE is in sysnc.." >> ${LOGFILE}
-${VERIFY} --tables="account branch teller history"
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Verify failed!!!!!" >> ${LOGFILE}
- failed
-fi
-}
+#---------------
+# Run Tests
+#---------------
-echo "tpcb-rep-tester.sh"
-echo "Script -> tpcb-rep-tester.sh is running..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> $LOGFILE
+header
wait_for_sql_ready
load_db
check_load
run_test
slave_verification
-print_date
-echo "NDBT_ProgramExit: OK"
-exit 0
+finish
+#---------------
# End of driver
+#---------------
=== modified file 'drivers/tpcb-tester.sh'
--- a/drivers/tpcb-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/tpcb-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,44 +1,45 @@
#!/bin/bash
-################################################################################
+#------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the MASTER and SLAVE clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#------------------------------------------------------------------------------
+
PWD=`pwd`
-echo $PWD
+#echo ${PWD}
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
failed_c(){
+ echo "Load Config"
echo ${FAILURE}
exit 1
}
-#################
+#---------------
# Load Config
-#################
+#---------------
+
CONF=${1}
if [ -f ${CONF} ]
then
. ${CONF}
else
- echo "Load Config"
- echo ${FAILURE}
- exit 1
- failed
+ failed_c
fi
-#########################
+#---------------
# Set Variables
-#########################
+#---------------
+
LOGFILE=${TESTCASE_LOG_DIR}/tpcb.log
CSVFILE=${TESTCASE_LOG_DIR}/tpcb.csv
RESULTSFILE=${TESTCASE_LOG_DIR}/tpcb.rpt
@@ -59,7 +60,7 @@ TPCB_DRIVER="${PERL} ${TPCB_DIR}/tpcbSql
TPCB_DRIVER="${TPCB_DRIVER} --log=${RESULTSFILE} --port=${MASTER_PORT}"
TPCB_DRIVER="${TPCB_DRIVER} --cvs=${CSVFILE}"
TPCB_DRIVER="${TPCB_DRIVER} --host=${MASTER} -r ${TESTCASE_LOG_DIR}/"
-TPCB_DRIVER="${TPCB_DRIVER} --work=${TPCB_DIR} -tt ${TEST_TIME} -nt 6 -tm 4"
+TPCB_DRIVER="${TPCB_DRIVER} --work=${TPCB_DIR} -tt ${TEST_TIME}"
TPCB_DRIVER="${TPCB_DRIVER} -nt ${NUM_TEST_LOOPS} -tm ${TEST_MODIFY}"
INIT_RDB="${INIT_RDB} -testN TPC-B -pk ${PKFILE} -l ${LOGFILE}"
@@ -70,121 +71,148 @@ UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFOFILE} -re ${PERF_REPORT}"
-################
-# Echo Line
-################
-line(){
-echo ${LINE} >> ${LOGFILE}
-}
-############
-# Print Date
-############
-print_date(){
-line
-date >> ${LOGFILE}
-line
-}
-###############
-# Test end time
-###############
-end_time(){
- ENDTIME=`date +'%F %T'`
- echo "end->${ENDTIME}" >> ${INFOFILE}
-}
-##############
-# Test failed
-##############
-failed(){
- print_date
- echo ${FAILURE} >> ${LOGFILE}
- echo ${FAILURE}
- echo "exit->1" >> ${INFOFILE}
- end_time
- if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- ${UPDATE_RDB}
- fi
- exit 1
+OPS_TIMER="${OPS_TIMER} --testName=TPC-B"
+
+#------------------
+# Script Functions
+#-----------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
}
-###########
-# DROP DB
-############
-remove_data(){
-line
-echo "Script -> Dropping TPCB database.." >> $LOGFILE
-MYSQL_MASTER < ${DROP_DB} >> ${LOGFILE} 2>&1
-}
-############################
-# LOAD DB
-###########################
-load_database(){
-line
-echo "Script -> Calling Load TPCB.." >> ${LOGFILE}
-${LOAD_TPCB} >> ${LOGFILE}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- remove_data
- failed
-fi
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+end_time()
+{
+ ENDTIME=`date +'%F %T'`
+ echo "end->${ENDTIME}" >> ${INFOFILE}
}
-############################
-# Run Tests
-###########################
-run_test(){
-line
-echo "Script -> Calling TPCB Driver, tests running" >> ${LOGFILE}
-${TPCB_DRIVER}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> TPCB Runs failed!!!!!" >> ${LOGFILE}
+
+failed()
+{
print_date
- failed
-fi
-echo "Script -> TPCB Tests have completed... " >> ${LOGFILE}
+ echo ${FAILURE} >> ${LOGFILE}
+ echo ${FAILURE}
+ echo "exit->1" >> ${INFOFILE}
+ end_time
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ ${UPDATE_RDB}
+ fi
+ remove_data
+ exit 1
}
-#########
-# MAIN
-#########
-echo "Script -> tpcb-tester.sh is running..."
-echo "Script -> tpcb-tester.sh is running..." > ${LOGFILE}
-#----------Update Information file and INIT BM DB--------
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo "name->TPC-B" >> ${INFOFILE}
- echo "testType->PERFORMANCE" >> ${INFOFILE}
- echo "tag->TPS" >> ${INFOFILE}
- echo "dataType->float" >> ${INFOFILE}
- echo "description->Scalability Testing" >> ${INFOFILE}
- echo "tr-description->OLTP TESTING" >> ${INFOFILE}
- STARTTIME=`date +'%F %T'`
- echo "start->${STARTTIME}" >> ${INFOFILE}
+
+remove_data()
+{
line
- echo ${INIT_RDB} >> ${LOGFILE}
- ${INIT_RDB}
-fi
-line
-#------------------------------------------
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> Dropping TPCB database.." >> $LOGFILE
+ ${OPS_TIMER} --testOp="DROP DB"
+ ${MYSQL_MASTER} < ${DROP_DB} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --end
+}
+
+load_database()
+{
+ line
+ echo "Script -> Calling Load TPCB.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE/LOAD DB"
+ ${LOAD_TPCB} >> ${LOGFILE}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ remove_data
+ failed
+ fi
+ ${OPS_TIMER} --end
+}
+
+run_test()
+{
+ line
+ echo "Script -> Calling TPCB Driver, tests running" >> ${LOGFILE}
+ ${TPCB_DRIVER}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> TPCB Runs failed!!!!!" >> ${LOGFILE}
+ print_date
+ failed
+ fi
+ echo "exit->0" >> ${INFOFILE}
+ echo "Script -> TPCB Tests have completed... " >> ${LOGFILE}
+}
+
+header()
+{
+ print_date
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> tpcb-tester.sh is running..."
+ echo "Script -> tpcb-tester.sh is running..." > ${LOGFILE}
+}
+
+update_info()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo "name->TPC-B" >> ${INFOFILE}
+ echo "testType->PERFORMANCE" >> ${INFOFILE}
+ echo "tag->TPS" >> ${INFOFILE}
+ echo "dataType->float" >> ${INFOFILE}
+ echo "description->Scalability Testing" >> ${INFOFILE}
+ echo "tr-description->OLTP TESTING" >> ${INFOFILE}
+ STARTTIME=`date +'%F %T'`
+ echo "start->${STARTTIME}" >> ${INFOFILE}
+ line
+ echo ${INIT_RDB} >> ${LOGFILE}
+ ${INIT_RDB}
+ line
+ fi
+}
+
+update_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ line
+ ${UPDATE_RDB}
+ fi
+}
+
+results_rpt()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ line
+ ${RESULTS_REPORT}
+ fi
+}
+
+finish()
+{
+ print_date
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+}
+
+#-------------
+# Run Test
+#-------------
+
+header
+update_info
load_database
run_test
-#----------Update Information file and BM DB--------
end_time
-echo "exit->0" >> ${INFOFILE}
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${UPDATE_RDB} >> ${LOGFILE}
- ${UPDATE_RDB}
-fi
-line
-#------------------------------------------
+update_bm
remove_data
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${RESULTS_REPORT} >> ${LOGFILE}
- ${RESULTS_REPORT}
-fi
-line
-print_date
-echo "NDBT_ProgramExit: OK"
-exit 0
+results_rpt
+finish
-# End of driver
+#--------------
+# End of script
+#--------------
=== modified file 'drivers/tpcc-dd-rep-tester.sh'
--- a/drivers/tpcc-dd-rep-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/tpcc-dd-rep-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,240 +1,293 @@
#!/bin/bash
-################################################################################
+#--------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#--------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#--------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#--------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#---------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#---------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-#########################
+#-----------------
# Set Variables
-#########################
-LOGFILE=$TESTCASE_LOG_DIR/tpcc-dd-rep.log
+#-----------------
+
+LOGFILE=${TESTCASE_LOG_DIR}/tpcc-dd-rep.log
RF=tpcc-dd-rep.rpt
-EXPLAINLOG=$TESTCASE_LOG_DIR/tpcc-dd-rep.explain
-CSV_FILE=$TESTCASE_LOG_DIR/tpcc-dd-rep.csv
-TPCC_DIR=$TEST_SCRIPTS_DIR/tpcc
-TPCC_DATA=$TPCC_DIR/data
-TPCC_SP_PATH=$TPCC_DIR/dbt2/storedproc/mysql
+EXPLAINLOG=${TESTCASE_LOG_DIR}/tpcc-dd-rep.explain
+CSV_FILE=${TESTCASE_LOG_DIR}/tpcc-dd-rep.csv
+TPCC_DIR=${TEST_SCRIPTS_DIR}/tpcc
+TPCC_DATA=${TPCC_DIR}/data
+TPCC_SP_PATH=${TPCC_DIR}/dbt2/storedproc/mysql
DB=dbt2
TEST_RUN_TIME=600
NUM_CONNECTIONS=10
NUM_WAREHOUSE=10
STACK_SIZE=512
-TPCC_SRC_DIR=$TPCC_DIR/$DB/src
-KILL_CLIENT=$TPCC_DIR/kill_client.sh
+TPCC_SRC_DIR=${TPCC_DIR}/${DB}/src
+KILL_CLIENT=${TPCC_DIR}/kill_client.sh
LINE="==========================================="
-UNDOFILESIZE=512M
+UNDOFILESIZE=1024M
+NUMDATAFILE=20
+DATAFILESIZE="100M"
+DATA_DONE=0
+
#Create data to load into dbt2
-TPCC_DATAGEN="$TPCC_SRC_DIR/datagen -w $NUM_WAREHOUSE --mysql -d $TPCC_DATA"
+TPCC_DATAGEN="${TPCC_SRC_DIR}/datagen -w ${NUM_WAREHOUSE} --mysql -d ${TPCC_DATA}"
#Wait for Master and slave Ready
-WFSQLR="$PERL $WAIT_FOR_READY --log=$LOGFILE --mpo $MASTER_PORT"
-WFSQLR="$WFSQLR --spo $SLAVE_PORT --mho $MASTER --sho $SLAVE"
+WFSQLR="${PERL} ${WAIT_FOR_READY} --log=${LOGFILE} --mpo ${MASTER_PORT}"
+WFSQLR="${WFSQLR} --spo ${SLAVE_PORT} --mho ${MASTER} --sho ${SLAVE}"
#Create Disk Data on Master and Slave
-TPCC_DISK_DATA="$CREATE_DISK_DATA --mysql-path $INSTALL_BIN_DIR/mysql"
-TPCC_DISK_DATA="$TPCC_DISK_DATA --mhost $MASTER --shost $SLAVE"
-TPCC_DISK_DATA="$TPCC_DISK_DATA --log $LOGFILE --engine NDB"
+CREATE_DD="${CREATE_DISK_DATA} --mysql-path ${MYSQL} --logfile-size ${UNDOFILESIZE}"
+CREATE_DD="${CREATE_DD} --mhost ${MASTER} --shost ${SLAVE}"
+CREATE_DD="${CREATE_DD} --log ${LOGFILE} --engine NDB"
+CREATE_DD="${CREATE_DD} --number-of-datafiles ${NUMDATAFILE}"
+CREATE_DD="${CREATE_DD} --datafile-size ${DATAFILESIZE}"
+
#Load dbt2 database
-LOAD_TPCC="$TPCC_DIR/mysql_load_db.sh --path $TPCC_DATA --port $MASTER_PORT"
-LOAD_TPCC="$LOAD_TPCC --host $MASTER --user root --mysql-path $INSTALL_BIN_DIR/mysql"
-LOAD_TPCC="$LOAD_TPCC --using-hash --engine NDB --log $LOGFILE --use-disk-cluster"
+LOAD_TPCC="${TPCC_DIR}/mysql_load_db.sh --path ${TPCC_DATA} --port ${MASTER_PORT}"
+LOAD_TPCC="${LOAD_TPCC} --host ${MASTER} --user root --mysql-path ${INSTALL_BIN_DIR}/mysql"
+LOAD_TPCC="${LOAD_TPCC} --using-hash --engine NDB --log ${LOGFILE} --use-disk-cluster"
#Load Stored Procedures
-LOAD_SP="$TPCC_DIR/mysql_load_sp.sh"
-LOAD_SP="$LOAD_SP --host $MASTER --port $MASTER_PORT --user root --log $LOGFILE"
-LOAD_SP="$LOAD_SP --client-path $INSTALL_BIN_DIR --sp-path $TPCC_SP_PATH"
+LOAD_SP="${TPCC_DIR}/mysql_load_sp.sh"
+LOAD_SP="${LOAD_SP} --host ${MASTER} --port ${MASTER_PORT} --user root --log ${LOGFILE}"
+LOAD_SP="${LOAD_SP} --client-path ${INSTALL_BIN_DIR} --sp-path ${TPCC_SP_PATH}"
#Check the db load on master and slave
-LOAD_CHECK="$PERL $CHECK_LOAD --mpo $MASTER_PORT --spo $SLAVE_PORT"
-LOAD_CHECK="$LOAD_CHECK --mho $MASTER --sho $SLAVE --log=$LOGFILE"
-CHECK_T1="--database=$DB --table=customer"
-CHECK_T2="--database=$DB --table=stock"
-CHECK_T3="--database=$DB --table=item"
+LOAD_CHECK="${PERL} ${CHECK_LOAD} --mpo ${MASTER_PORT} --spo ${SLAVE_PORT}"
+LOAD_CHECK="${LOAD_CHECK} --mho ${MASTER} --sho ${SLAVE} --log=${LOGFILE}"
+CHECK_T1="--database=${DB} --table=customer"
+CHECK_T2="--database=${DB} --table=stock"
+CHECK_T3="--database=${DB} --table=item"
#Run explain
-PLAN="$TPCC_DIR/mysql_dbt2_plans.sh --log $EXPLAINLOG --client-path $INSTALL_BIN_DIR"
-PLAN="$PLAN --host $MASTER --port $MASTER_PORT"
+PLAN="${TPCC_DIR}/mysql_dbt2_plans.sh --log ${EXPLAINLOG} --client-path ${INSTALL_BIN_DIR}"
+PLAN="${PLAN} --host ${MASTER} --port ${MASTER_PORT}"
#TPCC Test Driver
-TPCC_DRIVER="$TPCC_DIR/run_mysql.sh --connections $NUM_CONNECTIONS"
-TPCC_DRIVER="$TPCC_DRIVER --time $TEST_RUN_TIME --warehouses $NUM_WAREHOUSE"
-TPCC_DRIVER="$TPCC_DRIVER --log-file $LOGFILE --stack-size $STACK_SIZE"
-TPCC_DRIVER="$TPCC_DRIVER --lib-client-path $INSTALL_LIB_DIR"
-TPCC_DRIVER="$TPCC_DRIVER --log-dir $TESTCASE_LOG_DIR --results-file $RF"
-TPCC_DRIVER="$TPCC_DRIVER --host $MASTER --port $MASTER_PORT"
-TPCC_DRIVER="$TPCC_DRIVER --test-path $TPCC_DIR/$DB --zero-delay"
-TPCC_DRIVER="$TPCC_DRIVER --csv-file $CSV_FILE"
-
-VERIFY="$PERL $SLAVE_VERIFICATION -mho $MASTER -sho $SLAVE"
-VERIFY="$VERIFY -mpo $MASTER_PORT -spo $SLAVE_PORT -vD $DB -bin $INSTALL_BIN_DIR"
-VERIFY="$VERIFY -log $LOGFILE --test=tpcc -f $TESTCASE_LOG_DIR -rdd"
-VERIFY="$VERIFY --verifyDrop"
-
-############################
-# Run Tests
-###########################
-
-line(){
-echo ${LINE} >> ${LOGFILE}
-}
-
-print_date(){
-line
-date >> ${LOGFILE}
-}
-
-failed(){
-remove_data
-print_date
-echo ${FAILURE}
-exit 1
-}
-
-create_data(){
-line
-echo "Script -> Creating DBT2 Data for load.." >> ${LOGFILE}
-${TPCC_DATAGEN} ${DATAGEN_ARGS} >> ${LOGFILE}
-}
-
-wait_for_ready(){
-line
-echo "Script -> Calling Wait for SQL ready..." >> ${LOGFILE}
-${WFSQLR}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> wait for sql ready failed" >> ${LOGFILE}
- failed
-fi
-echo "Script -> wait for sql ready completed" >> ${LOGFILE}
-}
-
-create_disk_data(){
-line
-echo "Script -> Calling Create Disk Data.." >> ${LOGFILE}
-${TPCC_DISK_DATA}
-}
-
-load_database(){
-line
-echo "Script -> Calling Load TPCC.." >> ${LOGFILE}
-${LOAD_TPCC}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load failed" >> ${LOGFILE}
- failed
-fi
-}
-
-load_sps(){
-line
-echo "Script -> Loading TPCC Store Procedures.." >> ${LOGFILE}
-${LOAD_SP}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load SP failed" >> ${LOGFILE}
- failed
-fi
-}
-
-remove_data(){
-COUNT=`ls ${TPCC_DATA} |wc -l`
-if [ ${COUNT} -ne 0 ];then
- PWD=`pwd`
- cd ${TPCC_DATA}
- rm -f *
- cd ${PWD}
-fi
-}
-
-check_load(){
-line
-echo "Script -> Calling Check load.. " >> ${LOGFILE}
-
-${LOAD_CHECK} ${CHECK_T1}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load check on ${CHECK_T1} failed!!!!!" >> ${LOGFILE}
- failed
-fi
-
-${LOAD_CHECK} ${CHECK_T2}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load check on ${CHECK_T3} failed!!!!!" >> ${LOGFILE}
- failed
-fi
-
-${LOAD_CHECK} ${CHECK_T3}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load check on ${CHECK_T3} failed!!!!!" >> ${LOGFILE}
- failed
-fi
-echo "Script -> Load check done" >> ${LOGFILE}
+DRIVER="${TPCC_DIR}/run_mysql.sh --connections ${NUM_CONNECTIONS}"
+DRIVER="${DRIVER} --time ${TEST_RUN_TIME} --warehouses ${NUM_WAREHOUSE}"
+DRIVER="${DRIVER} --log-file ${LOGFILE} --stack-size ${STACK_SIZE}"
+DRIVER="${DRIVER} --lib-client-path ${INSTALL_LIB_DIR}"
+DRIVER="${DRIVER} --log-dir ${TESTCASE_LOG_DIR} --results-file ${RF}"
+DRIVER="${DRIVER} --host ${MASTER} --port ${MASTER_PORT}"
+DRIVER="${DRIVER} --test-path ${TPCC_DIR}/${DB} --zero-delay"
+DRIVER="${DRIVER} --csv-file ${CSV_FILE}"
+
+VERIFY="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER} -sho ${SLAVE}"
+VERIFY="${VERIFY} -mpo ${MASTER_PORT} -spo ${SLAVE_PORT} -vD ${DB} -bin ${INSTALL_BIN_DIR}"
+VERIFY="${VERIFY} -log ${LOGFILE} --test=tpcc -f ${TESTCASE_LOG_DIR} -rdd"
+VERIFY="${VERIFY} --num=${NUMDATAFILE}"
+DROP_ONLY="${VERIFY} --dropOnly"
+VERIFY="${VERIFY} --verifyDrop"
+
+OPS_TIMER="${OPS_TIMER} --testName=TPC-C-DD-REP"
+
+#---------------------
+# Script Functions
+#---------------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+failed()
+{
+ remove_data
+ if [ "${DATA_DONE}" -ne 0 ];then
+ ${OPS_TIMER} --testOp="FAILED DROP DD"
+ ${DROP_ONLY}
+ ${OPS_TIMER} --end
+ fi
+ print_date
+ echo ${FAILURE}
+ exit 1
}
-run_exlain(){
-line
-echo "Script -> Running Explain" >> ${LOGFILE}
-${PLAN} >> ${LOGFILE}
-}
-
-run_test(){
-line
-echo "Script -> Running Test" >> ${LOGFILE}
-${TPCC_DRIVER}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> TPCC run failed!!!!!" >> ${LOGFILE}
+create_data()
+{
+ line
+ echo "Script -> Creating DBT2 Data for load.." >> ${LOGFILE}
+ ${TPCC_DATAGEN} ${DATAGEN_ARGS} >> ${LOGFILE}
+}
+
+wait_for_ready()
+{
+ line
+ echo "Script -> Calling Wait for SQL ready..." >> ${LOGFILE}
+ ${WFSQLR}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> wait for sql ready failed" >> ${LOGFILE}
+ failed
+ fi
+ echo "Script -> wait for sql ready completed" >> ${LOGFILE}
+}
+
+create_disk_data()
+{
+ line
+ echo "Script -> Calling Create Disk Data.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE DD"
+ ${CREATE_DD}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ echo "Script -> Create DD failed" >> ${LOGFILE}
+ failed
+ fi
+ ${OPS_TIMER} --end
+ ${DATA_DONE}=1
+}
+
+load_database()
+{
+ line
+ echo "Script -> Calling Load TPCC.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="LOAD DB"
+ ${LOAD_TPCC}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ echo "Script -> Load failed" >> ${LOGFILE}
+ failed
+ fi
+ ${OPS_TIMER} --end
+}
+
+load_sps()
+{
+ line
+ echo "Script -> Loading TPCC Store Procedures.." >> ${LOGFILE}
+ ${LOAD_SP}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load SP failed" >> ${LOGFILE}
+ failed
+ fi
+}
+
+remove_data()
+{
+ COUNT=`ls ${TPCC_DATA} |wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ PWD=`pwd`
+ cd ${TPCC_DATA}
+ rm -f *
+ cd ${PWD}
+ fi
+}
+
+check_load()
+{
+ line
+ echo "Script -> Calling Check load.. " >> ${LOGFILE}
+ ${LOAD_CHECK} ${CHECK_T1}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load check on ${CHECK_T1} failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ ${LOAD_CHECK} ${CHECK_T2}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load check on ${CHECK_T3} failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ ${LOAD_CHECK} ${CHECK_T3}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load check on ${CHECK_T3} failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ echo "Script -> Load check done" >> ${LOGFILE}
+}
+
+run_exlain()
+{
+ line
+ echo "Script -> Running Explain" >> ${LOGFILE}
+ ${PLAN} >> ${LOGFILE}
+}
+
+run_test()
+{
+ line
+ echo "Script -> Running Test" >> ${LOGFILE}
+ ${DRIVER}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> TPCC run failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+}
+
+verify_slave()
+{
+ line
+ echo "Script -> Verifing that slave is in sysnc.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="Verify Slave, DROP DD"
+ ${VERIFY} --tables="item warehouse stock district customer new_order"
+ RC=${?}
+ if [ ${RC} -eq 0 ]; then
+ ${OPS_TIMER} --end
+ print_date
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+ fi
+ ${OPS_TIMER} --end
+ line
+ echo "Script -> Verify Master& Slave failed!!!!" >> ${LOGFILE}
failed
-fi
}
-verify_slave(){
-line
-echo "Script -> Verifing that slave is in sysnc.." >> ${LOGFILE}
-${VERIFY} --tables="item warehouse stock district customer new_order"
-RC=$?
-if [ ${RC} -eq 0 ]; then
+header()
+{
print_date
- echo "NDBT_ProgramExit: OK"
- exit 0
-fi
-line
-echo "Script -> Verify Master& Slave failed!!!!" >> ${LOGFILE}
-failed
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> tpcc-dd-rep-tester.sh"
+ echo "Script -> tpcc-dd-rep-tester.sh is running..." > ${LOGFILE}
}
-echo "Script -> tpcc-dd-rep-tester.sh"
-echo "Script -> tpcc-dd-rep-tester.sh is running..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+#------------
+# Run Test
+#------------
+
+header
wait_for_ready
create_data
create_disk_data
@@ -245,4 +298,6 @@ check_load
run_test
verify_slave
+#------------
#End of script
+#------------
=== modified file 'drivers/tpcc-dd-tester.sh'
--- a/drivers/tpcc-dd-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/tpcc-dd-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,90 +1,97 @@
#!/bin/bash
-################################################################################
+#-------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#-------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#-------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#-------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-#########################
+#---------------
# Set Variables
-#########################
+#---------------
+
LOGFILE=${TESTCASE_LOG_DIR}/tpcc-dd.log
CSV_FILE=${TESTCASE_LOG_DIR}/tpcc-dd.csv
INFO_FILE=${TESTCASE_LOG_DIR}/tpcc-dd.info
PK_FILE=${TESTCASE_LOG_DIR}/tpcc-dd.pk
PERF_REPORT=${TESTCASE_LOG_DIR}/tpcc-dd-performance.rpt
RF=tpcc-dd.rpt
-EXPLAINLOG=$TESTCASE_LOG_DIR/tpcc-dd.explain
-TPCC_DIR=$TEST_SCRIPTS_DIR/tpcc
-TPCC_DATA=$TPCC_DIR/data
-TPCC_SP_PATH=$TPCC_DIR/dbt2/storedproc/mysql
+EXPLAINLOG=${TESTCASE_LOG_DIR}/tpcc-dd.explain
+TPCC_DIR=${TEST_SCRIPTS_DIR}/tpcc
+TPCC_DATA=${TPCC_DIR}/data
+TPCC_SP_PATH=${TPCC_DIR}/dbt2/storedproc/mysql
DB=dbt2
TEST_RUN_TIME=600
NUM_CONNECTIONS=10
NUM_WAREHOUSE=10
STACK_SIZE=512
-TPCC_SRC_DIR=$TPCC_DIR/$DB/src
-KILL_CLIENT=$TPCC_DIR/kill_client.sh
+TPCC_SRC_DIR=${TPCC_DIR}/${DB}/src
+KILL_CLIENT=${TPCC_DIR}/kill_client.sh
LINE="==========================================="
-UNDOFILESIZE=512M
+UNDOFILESIZE=1024M
+NUMDATAFILE=20
+DATAFILESIZE="100M"
+DD_DONE=0
#Create data to load into dbt2
-TPCC_DATAGEN="$TPCC_SRC_DIR/datagen -w $NUM_WAREHOUSE --mysql -d $TPCC_DATA"
+TPCC_DATAGEN="${TPCC_SRC_DIR}/datagen -w ${NUM_WAREHOUSE} --mysql -d ${TPCC_DATA}"
#Create Disk Data on Master and Slave
-TPCC_DISK_DATA="$CREATE_DISK_DATA --mysql-path $MYSQL"
-TPCC_DISK_DATA="$TPCC_DISK_DATA --mhost $MASTER --log $LOGFILE --engine NDB"
+CREATE_DD="${CREATE_DISK_DATA} --mysql-path ${MYSQL} --logfile-size ${UNDOFILESIZE}"
+CREATE_DD="${CREATE_DD} --mhost ${MASTER} --log ${LOGFILE} --engine NDB"
+CREATE_DD="${CREATE_DD} --number-of-datafiles ${NUMDATAFILE}"
+CREATE_DD="${CREATE_DD} --datafile-size ${DATAFILESIZE}"
#Load dbt2 database
-LOAD_TPCC="$TPCC_DIR/mysql_load_db.sh --path $TPCC_DATA --port $MASTER_PORT"
-LOAD_TPCC="$LOAD_TPCC --host $MASTER --user root --mysql-path $MYSQL"
-LOAD_TPCC="$LOAD_TPCC --using-hash --engine NDB --log $LOGFILE"
-LOAD_TPCC="$LOAD_TPCC --use-disk-cluster"
+LOAD="${TPCC_DIR}/mysql_load_db.sh --path ${TPCC_DATA} --port ${MASTER_PORT}"
+LOAD="${LOAD} --host ${MASTER} --user root --mysql-path ${MYSQL}"
+LOAD="${LOAD} --using-hash --engine NDB --log ${LOGFILE}"
+LOAD="${LOAD} --use-disk-cluster"
#Load Stored Procedures
-LOAD_SP="$TPCC_DIR/mysql_load_sp.sh --host $MASTER --port $MASTER_PORT"
-LOAD_SP="$LOAD_SP --user root --log $LOGFILE --client-path $INSTALL_BIN_DIR"
-LOAD_SP="$LOAD_SP --sp-path $TPCC_SP_PATH"
+LOAD_SP="${TPCC_DIR}/mysql_load_sp.sh --host ${MASTER} --port ${MASTER_PORT}"
+LOAD_SP="${LOAD_SP} --user root --log ${LOGFILE} --client-path ${INSTALL_BIN_DIR}"
+LOAD_SP="${LOAD_SP} --sp-path ${TPCC_SP_PATH}"
#Run explain:
-PLAN="$TPCC_DIR/mysql_dbt2_plans.sh --log $EXPLAINLOG"
-PLAN="$PLAN --client-path $INSTALL_BIN_DIR --host $MASTER --port $MASTER_PORT"
+PLAN="${TPCC_DIR}/mysql_dbt2_plans.sh --log ${EXPLAINLOG}"
+PLAN="${PLAN} --client-path ${INSTALL_BIN_DIR} --host ${MASTER} --port ${MASTER_PORT}"
#TPCC Test Driver
-TPCC_DRIVER="$TPCC_DIR/run_mysql.sh --connections $NUM_CONNECTIONS"
-TPCC_DRIVER="$TPCC_DRIVER --time $TEST_RUN_TIME"
-TPCC_DRIVER="$TPCC_DRIVER --warehouses $NUM_WAREHOUSE --log-file $LOGFILE"
-TPCC_DRIVER="$TPCC_DRIVER --stack-size $STACK_SIZE"
-TPCC_DRIVER="$TPCC_DRIVER --lib-client-path $INSTALL_LIB_DIR --log-dir $TESTCASE_LOG_DIR"
-TPCC_DRIVER="$TPCC_DRIVER --results-file $RF --host $MASTER --port $MASTER_PORT"
-TPCC_DRIVER="$TPCC_DRIVER --test-path $TPCC_DIR/$DB --zero-delay"
-TPCC_DRIVER="$TPCC_DRIVER --csv-file $CSV_FILE"
+DRIVER="${TPCC_DIR}/run_mysql.sh --connections ${NUM_CONNECTIONS}"
+DRIVER="${DRIVER} --time ${TEST_RUN_TIME}"
+DRIVER="${DRIVER} --warehouses ${NUM_WAREHOUSE} --log-file ${LOGFILE}"
+DRIVER="${DRIVER} --stack-size ${STACK_SIZE}"
+DRIVER="${DRIVER} --lib-client-path ${INSTALL_LIB_DIR} --log-dir ${TESTCASE_LOG_DIR}"
+DRIVER="${DRIVER} --results-file ${RF} --host ${MASTER} --port ${MASTER_PORT}"
+DRIVER="${DRIVER} --test-path ${TPCC_DIR}/${DB} --zero-delay"
+DRIVER="${DRIVER} --csv-file ${CSV_FILE}"
-VERIFY="$PERL $SLAVE_VERIFICATION -mho $MASTER -mpo $MASTER_PORT -vD $DB"
-VERIFY="$VERIFY -l $LOGFILE --test=tpcc_dd -rdd --dropOnly"
+VERIFY="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER} -mpo ${MASTER_PORT} -vD ${DB}"
+VERIFY="${VERIFY} -l ${LOGFILE} --test=tpcc_dd -rdd --dropOnly --num=${NUMDATAFILE}"
INIT_RDB="${INIT_RDB} -testN TPC-C-DD -pk ${PK_FILE} -l ${LOGFILE}"
INIT_RDB="${INIT_RDB} -testP test/tpcc/dbt2 -testS tpcc-dd-tester-bm.sh"
@@ -94,21 +101,31 @@ UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFO_FILE} -re ${PERF_REPORT}"
-############################
-# Run Tests
-###########################
+OPS_TIMER="${OPS_TIMER} --testName=TPC-C-DD"
-line(){
+#------------------
+# Script Functions
+#------------------
+
+line()
+{
echo ${LINE} >> ${LOGFILE}
}
-print_date(){
-line
-date >> $LOGFILE
-line
+print_date()
+{
+ line
+ date >> $LOGFILE
+ line
}
-failed(){
+failed()
+{
+ if [ "${DD_DONE}" -ne 0 ];then
+ ${OPS_TIMER} --testOp="FAILED DROP DD"
+ drop_disk_data
+ ${OPS_TIMER} --end
+ fi
remove_data
echo "exit->1" >> ${INFO_FILE}
end_time
@@ -119,45 +136,64 @@ failed(){
exit 1
}
-end_time(){
+end_time()
+{
ENDTIME=`date +'%F %T'`
echo "end->${ENDTIME}" >> ${INFO_FILE}
+ echo "exit->0" >> ${INFO_FILE}
}
-create_data(){
+create_data()
+{
echo "Script -> Creating DBT2 Data for load.." >> ${LOGFILE}
${TPCC_DATAGEN} >>${LOGFILE}
}
-create_disk_data(){
+create_disk_data()
+{
line
echo "Script -> Calling Create Disk Data.." >> ${LOGFILE}
- ${TPCC_DISK_DATA} >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE DD"
+ ${CREATE_DD}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ echo "Script -> Create Disk Data failed" >> ${LOGFILE}
+ failed
+ fi
+ ${OPS_TIMER} --end
+ ${DD_DONE}=1
}
-load_database(){
+load_database()
+{
line
echo "Script -> Calling Load TPCC DD.." >> ${LOGFILE}
- ${LOAD_TPCC}
- RC=$?
+ ${OPS_TIMER} --testOp="LOAD DB"
+ ${LOAD}
+ RC=${?}
if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
echo "Script -> Load failed" >> ${LOGFILE}
failed
fi
+ ${OPS_TIMER} --end
}
-load_sp(){
+load_sp()
+{
line
echo "Script -> Loading TPCC Store Procedures.." >> ${LOGFILE}
${LOAD_SP}
- RC=$?
+ RC=${?}
if [ ${RC} -ne 0 ]; then
echo "Script -> Load SP failed" >> ${LOGFILE}
failed
fi
}
-remove_data(){
+remove_data()
+{
COUNT=`ls ${TPCC_DATA} |wc -l`
if [ ${COUNT} -ne 0 ];then
PWD=`pwd`
@@ -167,87 +203,106 @@ remove_data(){
fi
}
-run_explain(){
+run_explain()
+{
line
echo "Script -> Running Explain" >> ${LOGFILE}
${PLAN} >> ${LOGFILE}
}
-run_test(){
+run_test()
+{
line
echo "Script -> Running Test" >> ${LOGFILE}
- ${TPCC_DRIVER}
- RC=$?
+ ${DRIVER}
+ RC=${?}
if [ ${RC} -ne 0 ]; then
echo "Script -> TPCC DD run failed!!!!!" >> ${LOGFILE}
failed
fi
}
-drop_disk_data(){
+drop_disk_data()
+{
line
echo "Script -> Calling Drop Disk Data TPCC.." >> ${LOGFILE}
${VERIFY}
- RC=$?
+ RC=${?}
if [ ${RC} -ne 0 ]; then
echo "Script -> Disk Data Drop Failed" >> ${LOGFILE}
failed
- else
- line
- if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${RESULTS_REPORT} >> ${LOGFILE}
- ${RESULTS_REPORT}
- fi
- line
- date >> ${LOGFILE}
+ fi
+}
+
+update_bm_db()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ ${UPDATE_RDB}
+ fi
+}
+
+do_results_report()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ ${RESULTS_REPORT}
+ fi
+}
+
+init_bm_db()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo "name->TPC-C-DD" >> ${INFO_FILE}
+ echo "testType->PERFORMANCE" >> ${INFO_FILE}
+ echo "tag->TPM" >> ${INFO_FILE}
+ echo "dataType->float" >> ${INFO_FILE}
+ echo "description->PERFORMANCE TESTING DISK DATA" >> ${INFO_FILE}
+ echo "tr-description->OLTP TESTING" >> ${INFO_FILE}
+ STARTTIME=`date +'%F %T'`
+ echo "start->${STARTTIME}" >> ${INFO_FILE}
line
- echo "NDBT_ProgramExit: OK"
- exit 0
+ echo ${INIT_RDB} >> ${LOGFILE}
+ ${INIT_RDB}
fi
}
-echo "Script -> tpcc-dd-tester.sh"
-echo "Script -> tpcc-dd-tester.sh is running..." > ${LOGFILE}
-line
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
-line
+finish()
+{
+ print_date
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+}
+
+header()
+{
+ print_date
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> tpcc-dd-tester.sh"
+ echo "Script -> tpcc-dd-tester.sh is running..." > ${LOGFILE}
+}
+
+#-----------
+# Run Test
+#-----------
+
+header
create_data
-print_date
create_disk_data
-print_date
load_database
load_sp
remove_data
run_explain
-#----------Update Information file and INIT BM DB--------
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo "name->TPC-C-DD" >> ${INFO_FILE}
- echo "testType->PERFORMANCE" >> ${INFO_FILE}
- echo "tag->TPM" >> ${INFO_FILE}
- echo "dataType->float" >> ${INFO_FILE}
- echo "description->PERFORMANCE TESTING DISK DATA" >> ${INFO_FILE}
- echo "tr-description->OLTP TESTING" >> ${INFO_FILE}
- STARTTIME=`date +'%F %T'`
- echo "start->${STARTTIME}" >> ${INFO_FILE}
- line
- echo ${INIT_RDB} >> ${LOGFILE}
- ${INIT_RDB}
-fi
-print_date
-#------------------------------------------
+init_bm_db
run_test
-#----------Update Information file and BM DB--------
-print_date
end_time
-echo "exit->0" >> ${INFO_FILE}
-line
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${UPDATE_RDB} >> ${LOGFILE}
- ${UPDATE_RDB}
-fi
-print_date
-#------------------------------------------
+update_bm_db
+${OPS_TIMER} --testOp="DROP DB"
drop_disk_data
-#------------------------------------------
-print_date
+${OPS_TIMER} --end
+do_results_report
+finish
+
+#-----------
#End of script
+#-----------
=== modified file 'drivers/tpcc-rep-tester.sh'
--- a/drivers/tpcc-rep-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/tpcc-rep-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,222 +1,257 @@
#!/bin/bash
-################################################################################
+#-------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#-------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#-------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#-------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#--------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#--------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-#########################
+#---------------
# Set Variables
-#########################
-LOGFILE=$TESTCASE_LOG_DIR/tpcc-rep.log
-CSV_FILE=$TESTCASE_LOG_DIR/tpcc-rep.csv
-EXPLAINLOG=$TESTCASE_LOG_DIR/tpcc.explain
-TPCC_DIR=$TEST_SCRIPTS_DIR/tpcc
-TPCC_DATA=$TPCC_DIR/data
-TPCC_SP_PATH=$TPCC_DIR/dbt2/storedproc/mysql
+#---------------
+
+LOGFILE=${TESTCASE_LOG_DIR}/tpcc-rep.log
+CSV_FILE=${TESTCASE_LOG_DIR}/tpcc-rep.csv
+EXPLAINLOG=${TESTCASE_LOG_DIR}/tpcc.explain
+TPCC_DIR=${TEST_SCRIPTS_DIR}/tpcc
+TPCC_DATA=${TPCC_DIR}/data
+TPCC_SP_PATH=${TPCC_DIR}/dbt2/storedproc/mysql
DB=dbt2
RF=tpcc-rep.rpt
TEST_RUN_TIME=600
NUM_CONNECTIONS=10
NUM_WAREHOUSE=10
STACK_SIZE=512
-TPCC_SRC_DIR=$TPCC_DIR/$DB/src
-KILL_CLIENT=$TPCC_DIR/kill_client.sh
+TPCC_SRC_DIR=${TPCC_DIR}/${DB}/src
+KILL_CLIENT=${TPCC_DIR}/kill_client.sh
LINE="==========================================="
#Create data to load into dbt2
-TPCC_DATAGEN="$TPCC_SRC_DIR/datagen"
-TPCC_DATAGEN="$TPCC_DATAGEN -w $NUM_WAREHOUSE --mysql -d $TPCC_DATA"
+DATAGEN="${TPCC_SRC_DIR}/datagen"
+DATAGEN="${DATAGEN} -w ${NUM_WAREHOUSE} --mysql -d ${TPCC_DATA}"
#Wait for Master and slave Ready
-WFSQLR="$PERL $WAIT_FOR_READY --log=$LOGFILE --mpo $MASTER_PORT"
-WFSQLR="$WFSQLR --spo $SLAVE_PORT --mho $MASTER --sho $SLAVE"
+WFSQLR="${PERL} ${WAIT_FOR_READY} --log=${LOGFILE} --mpo ${MASTER_PORT}"
+WFSQLR="${WFSQLR} --spo ${SLAVE_PORT} --mho ${MASTER} --sho ${SLAVE}"
#Load dbt2 database
-LOAD_TPCC="$TPCC_DIR/mysql_load_db.sh --path $TPCC_DATA"
-LOAD_TPCC="$LOAD_TPCC --port $MASTER_PORT --host $MASTER --user root"
-LOAD_TPCC="$LOAD_TPCC --mysql-path $INSTALL_BIN_DIR/mysql --using-hash"
-LOAD_TPCC="$LOAD_TPCC --engine NDB --log $LOGFILE"
+LOAD="${TPCC_DIR}/mysql_load_db.sh --path ${TPCC_DATA}"
+LOAD="${LOAD} --port ${MASTER_PORT} --host ${MASTER} --user root"
+LOAD="${LOAD} --mysql-path ${INSTALL_BIN_DIR}/mysql --using-hash"
+LOAD="${LOAD} --engine NDB --log ${LOGFILE}"
#Load Stored Procedures
-LOAD_SP="$TPCC_DIR/mysql_load_sp.sh --host $MASTER --port $MASTER_PORT"
-LOAD_SP="$LOAD_SP --user root --log $LOGFILE --client-path $INSTALL_BIN_DIR"
-LOAD_SP="$LOAD_SP --sp-path $TPCC_SP_PATH"
+LOAD_SP="${TPCC_DIR}/mysql_load_sp.sh --host ${MASTER} --port ${MASTER_PORT}"
+LOAD_SP="${LOAD_SP} --user root --log ${LOGFILE} --client-path ${INSTALL_BIN_DIR}"
+LOAD_SP="${LOAD_SP} --sp-path ${TPCC_SP_PATH}"
#Check the db load on master and slave
-LOAD_CHECK="$PERL $CHECK_LOAD --mpo $MASTER_PORT --spo $SLAVE_PORT"
-LOAD_CHECK="$LOAD_CHECK --mho $MASTER --sho $SLAVE --log=$LOGFILE"
-CHECK_T1="--database=$DB --table=customer"
-CHECK_T2="--database=$DB --table=stock"
-CHECK_T3="--database=$DB --table=item"
+LOAD_CHECK="${PERL} ${CHECK_LOAD} --mpo ${MASTER_PORT} --spo ${SLAVE_PORT}"
+LOAD_CHECK="${LOAD_CHECK} --mho ${MASTER} --sho ${SLAVE} --log=${LOGFILE}"
+CHECK_T1="--database=${DB} --table=customer"
+CHECK_T2="--database=${DB} --table=stock"
+CHECK_T3="--database=${DB} --table=item"
#Run explain
-PLAN="$TPCC_DIR/mysql_dbt2_plans.sh"
-PLAN="$PLAN --log $EXPLAINLOG --client-path $INSTALL_BIN_DIR"
-PLAN="$PLAN --host $MASTER --port $MASTER_PORT"
+PLAN="${TPCC_DIR}/mysql_dbt2_plans.sh"
+PLAN="${PLAN} --log ${EXPLAINLOG} --client-path ${INSTALL_BIN_DIR}"
+PLAN="${PLAN} --host ${MASTER} --port ${MASTER_PORT}"
#TPCC Test Driver
-TPCC_DRIVER="$TPCC_DIR/run_mysql.sh --connections $NUM_CONNECTIONS"
-TPCC_DRIVER="$TPCC_DRIVER --time $TEST_RUN_TIME --warehouses $NUM_WAREHOUSE"
-TPCC_DRIVER="$TPCC_DRIVER --log-file $LOGFILE --stack-size $STACK_SIZE"
-TPCC_DRIVER="$TPCC_DRIVER --lib-client-path $INSTALL_LIB_DIR"
-TPCC_DRIVER="$TPCC_DRIVER --log-dir $TESTCASE_LOG_DIR"
-TPCC_DRIVER="$TPCC_DRIVER --host $MASTER --port $MASTER_PORT"
-TPCC_DRIVER="$TPCC_DRIVER --test-path $TPCC_DIR/$DB --zero-delay"
-TPCC_DRIVER="$TPCC_DRIVER --csv-file $CSV_FILE --results-file $RF"
-
-VERIFY="$PERL $SLAVE_VERIFICATION -mho $MASTER -sho $SLAVE"
-VERIFY="$VERIFY -mpo $MASTER_PORT -spo $SLAVE_PORT -vD $DB"
-VERIFY="$VERIFY -bin $INSTALL_BIN_DIR -log $LOGFILE --test=tpcc -f $TEST_TMP_DIR"
-VERIFY="$VERIFY -f $TESTCASE_LOG_DIR --verifyDrop"
-
-line(){
-echo ${LINE} >> ${LOGFILE}
-}
-
-print_date(){
-line
-date >> $LOGFILE
-line
-}
-
-failed(){
-print_date
-echo ${FAILURE}
-exit 1
-}
-
-create_data(){
-line
-echo "Script -> Creating DBT2 Data for load.." >> ${LOGFILE}
-${TPCC_DATAGEN} >> ${LOGFILE}
-}
-
-wait_for_sql_ready(){
-line
-echo "Script -> Calling Wait for SQL ready..." >> ${LOGFILE}
-${WFSQLR}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> wait for sql ready failed" >> ${LOGFILE}
- failed
-fi
-}
-
-load_db(){
-line
-echo "Script -> Calling Load TPCC.." >> ${LOGFILE}
-${LOAD_TPCC}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load failed" >> ${LOGFILE}
- failed
-fi
-line
-echo "Script -> Loading TPCC Store Procedures.." >> ${LOGFILE}
-${LOAD_SP}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load SP failed" >> ${LOGFILE}
- failed
-fi
-}
-
-remove_data(){
-if [ -d ${TPCC_DATA} ];then
- PWD=`pwd`
- cd ${TPCC_DATA}
- rm -f *
- cd ${PWD}
-fi
-}
-
-check_load(){
-line
-echo "Script -> Calling Check load.. " >> ${LOGFILE}
-${LOAD_CHECK} ${CHECK_T1}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load check on ${CHECK_T1} failed!!!!!" >> ${LOGFILE}
- failed
-fi
-
-${LOAD_CHECK} ${CHECK_T2}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load check on ${CHECK_T2} failed!!!!!" >> ${LOGFILE}
- failed
-fi
-
-${LOAD_CHECK} ${CHECK_T3}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Load check on ${CHECK_T3} failed!!!!!" >> ${LOGFILE}
- failed
-fi
-echo "Script -> Load check done" >> ${LOGFILE}
-
-}
-
-run_plan(){
-line
-echo "Script -> Running Explain" >> ${LOGFILE}
-${PLAN} >> ${LOGFILE}
-}
-
-run_test(){
-line
-echo "Script -> Running Test" >> ${LOGFILE}
-${TPCC_DRIVER}
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> TPCC run failed!!!!!" >> ${LOGFILE}
- failed
-fi
-}
-
-slave_verify(){
-line
-echo "Script -> Verifing that slave is in sysnc.." >> ${LOGFILE}
-${VERIFY} --tables="item warehouse stock district customer new_order"
-RC=$?
-if [ ${RC} -ne 0 ]; then
- echo "Script -> Verify Master& Slave failed!!!!" >> ${LOGFILE}
- failed
-fi
+DRIVER="${TPCC_DIR}/run_mysql.sh --connections ${NUM_CONNECTIONS}"
+DRIVER="${DRIVER} --time ${TEST_RUN_TIME} --warehouses ${NUM_WAREHOUSE}"
+DRIVER="${DRIVER} --log-file ${LOGFILE} --stack-size ${STACK_SIZE}"
+DRIVER="${DRIVER} --lib-client-path ${INSTALL_LIB_DIR}"
+DRIVER="${DRIVER} --log-dir ${TESTCASE_LOG_DIR}"
+DRIVER="${DRIVER} --host ${MASTER} --port ${MASTER_PORT}"
+DRIVER="${DRIVER} --test-path ${TPCC_DIR}/${DB} --zero-delay"
+DRIVER="${DRIVER} --csv-file ${CSV_FILE} --results-file ${RF}"
+
+VERIFY="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER} -sho ${SLAVE}"
+VERIFY="${VERIFY} -mpo ${MASTER_PORT} -spo ${SLAVE_PORT} -vD ${DB}"
+VERIFY="${VERIFY} -bin ${INSTALL_BIN_DIR} -log ${LOGFILE} --test=tpcc -f ${TEST_TMP_DIR}"
+VERIFY="${VERIFY} -f ${TESTCASE_LOG_DIR} --verifyDrop"
+
+OPS_TIMER="${OPS_TIMER} --testName=TPC-C-REP"
+
+#--------------------
+# Script Functions
+#--------------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+failed()
+{
+ print_date
+ echo ${FAILURE}
+ exit 1
+}
+
+create_data()
+{
+ line
+ echo "Script -> Creating DBT2 Data for load.." >> ${LOGFILE}
+ ${DATAGEN} >> ${LOGFILE}
+}
+
+wait_for_sql_ready()
+{
+ line
+ echo "Script -> Calling Wait for SQL ready..." >> ${LOGFILE}
+ ${WFSQLR}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> wait for sql ready failed" >> ${LOGFILE}
+ failed
+ fi
+}
+
+load_db()
+{
+ line
+ echo "Script -> Calling Load TPCC.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="LOAD DB"
+ ${LOAD}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ echo "Script -> Load failed" >> ${LOGFILE}
+ failed
+ fi
+ ${OPS_TIMER} --end
+ line
+ echo "Script -> Loading TPCC Store Procedures.." >> ${LOGFILE}
+ ${LOAD_SP}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load SP failed" >> ${LOGFILE}
+ failed
+ fi
+}
+
+remove_data()
+{
+ if [ -d ${TPCC_DATA} ];then
+ PWD=`pwd`
+ cd ${TPCC_DATA}
+ rm -f *
+ cd ${PWD}
+ fi
+}
+
+check_load()
+{
+ line
+ echo "Script -> Calling Check load.. " >> ${LOGFILE}
+ ${LOAD_CHECK} ${CHECK_T1}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load check on ${CHECK_T1} failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ ${LOAD_CHECK} ${CHECK_T2}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load check on ${CHECK_T2} failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ ${LOAD_CHECK} ${CHECK_T3}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> Load check on ${CHECK_T3} failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+ echo "Script -> Load check done" >> ${LOGFILE}
+}
+
+run_plan()
+{
+ line
+ echo "Script -> Running Explain" >> ${LOGFILE}
+ ${PLAN} >> ${LOGFILE}
+}
+
+run_test()
+{
+ line
+ echo "Script -> Running Test" >> ${LOGFILE}
+ ${DRIVER}
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> TPCC run failed!!!!!" >> ${LOGFILE}
+ failed
+ fi
+}
+
+slave_verify()
+{
+ line
+ echo "Script -> Verifing that slave is in sysnc.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="VERIFY SLAVE & DROP DB"
+ ${VERIFY} --tables="item warehouse stock district customer new_order"
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
+ echo "Script -> Verify Master& Slave failed!!!!" >> ${LOGFILE}
+ failed
+ fi
+ ${OPS_TIMER} --end
+}
+
+header()
+{
+ print_date
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
+ echo "Script -> tpcc-rep-tester.sh"
+ echo "Script -> tpcc-rep-tester.sh is running..." >> ${LOGFILE}
+}
+
+finish()
+{
+ print_date
+ echo "Script -> Master & Slave in sync. Test Complete" >> ${LOGFILE}
+ echo "NDBT_ProgramExit: OK"
+ exit 0
}
-############################
+#-----------
# Run Tests
-###########################
+#-----------
-echo "Script -> tpcc-rep-tester.sh"
-echo "Script -> tpcc-rep-tester.sh is running..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+header
wait_for_sql_ready
create_data
load_db
@@ -225,9 +260,8 @@ check_load
run_plan
run_test
slave_verify
-print_date
-echo "Script -> Master & Slave in sync. Test Complete" >> ${LOGFILE}
-echo "NDBT_ProgramExit: OK"
-exit 0
+finish
+#-------------
#End of script
+#-------------
=== modified file 'drivers/tpcc-tester.sh'
--- a/drivers/tpcc-tester.sh 2008-12-17 15:05:57 +0000
+++ b/drivers/tpcc-tester.sh 2009-02-13 21:08:34 +0000
@@ -1,86 +1,88 @@
#!/bin/bash
-################################################################################
+#----------------------------------------------------------------------------------
# This script is built to run under Cluster Replication Automation and is called
# by ATRT once the master and slave clusters (including mysqld process) have been
# started
# acrt = automated cluster replication testing
-################################################################################
+#----------------------------------------------------------------------------------
-###########################################################################
+#set -x
+#----------------------------------------------------------------------------------
# Set X is for debugging. Should be commented out for runs or it will cause
# test failure
-###########################################################################
-#set -x
+#----------------------------------------------------------------------------------
OKAY="NDBT_ProgramExit: OK"
FAILURE="NDBT_ProgramExit: Failed"
-#################
+#--------------
# Load Config
-#################
-CONF=$1
-if [ -f $CONF ]
+#--------------
+
+CONF=${1}
+if [ -f ${CONF} ]
then
- . $CONF
+ . ${CONF}
else
echo "Load Config"
- echo $FAILURE
+ echo ${FAILURE}
exit 1
fi
-#########################
+#-----------------
# Set Variables
-#########################
-LOGFILE=$TESTCASE_LOG_DIR/tpcc.log
-PK_FILE=$TESTCASE_LOG_DIR/tpcc.pk
-INFO_FILE=$TESTCASE_LOG_DIR/tpcc.info
-CSV_FILE=$TESTCASE_LOG_DIR/tpcc.csv
-PERF_REPORT=$TESTCASE_LOG_DIR/tpcc.performance.rpt
+#-----------------
+
+LOGFILE=${TESTCASE_LOG_DIR}/tpcc.log
+PK_FILE=${TESTCASE_LOG_DIR}/tpcc.pk
+INFO_FILE=${TESTCASE_LOG_DIR}/tpcc.info
+CSV_FILE=${TESTCASE_LOG_DIR}/tpcc.csv
+PERF_REPORT=${TESTCASE_LOG_DIR}/tpcc.performance.rpt
RF=tpcc.rpt
-EXPLAINLOG=$TESTCASE_LOG_DIR/tpcc.explain
-TPCC_DIR=$TEST_SCRIPTS_DIR/tpcc
-TPCC_DATA=$TPCC_DIR/data
-TPCC_SP_PATH=$TPCC_DIR/dbt2/storedproc/mysql
+EXPLAINLOG=${TESTCASE_LOG_DIR}/tpcc.explain
+TPCC_DIR=${TEST_SCRIPTS_DIR}/tpcc
+TPCC_DATA=${TPCC_DIR}/data
+TPCC_SP_PATH=${TPCC_DIR}/dbt2/storedproc/mysql
DB=dbt2
TEST_RUN_TIME=600
NUM_CONNECTIONS=10
NUM_WAREHOUSE=10
STACK_SIZE=512
-TPCC_SRC_DIR=$TPCC_DIR/$DB/src
-KILL_CLIENT=$TPCC_DIR/kill_client.sh
+TPCC_SRC_DIR=${TPCC_DIR}/${DB}/src
+KILL_CLIENT=${TPCC_DIR}/kill_client.sh
LINE="==========================================="
DROP_DB=${TPCC_DIR}/dbCleanup.sql
#Create data to load into dbt2
-TPCC_DATAGEN="$TPCC_SRC_DIR/datagen -w $NUM_WAREHOUSE --mysql -d $TPCC_DATA"
+DATAGEN="${TPCC_SRC_DIR}/datagen -w ${NUM_WAREHOUSE} --mysql -d ${TPCC_DATA}"
#Load dbt2 database
-LOAD_TPCC="$TPCC_DIR/mysql_load_db.sh --path $TPCC_DATA --port $MASTER_PORT"
-LOAD_TPCC="$LOAD_TPCC --host $MASTER --user root"
-LOAD_TPCC="$LOAD_TPCC --mysql-path $INSTALL_BIN_DIR/mysql"
-LOAD_TPCC="$LOAD_TPCC --using-hash --engine NDB --log $LOGFILE"
+LOAD="${TPCC_DIR}/mysql_load_db.sh --path ${TPCC_DATA} --port ${MASTER_PORT}"
+LOAD="${LOAD} --host ${MASTER} --user root"
+LOAD="${LOAD} --mysql-path ${INSTALL_BIN_DIR}/mysql"
+LOAD="${LOAD} --using-hash --engine NDB --log ${LOGFILE}"
#Load Stored Procedures
-LOAD_SP="$TPCC_DIR/mysql_load_sp.sh --host $MASTER --port $MASTER_PORT"
-LOAD_SP="$LOAD_SP --user root --log $LOGFILE --client-path"
-LOAD_SP="$LOAD_SP $INSTALL_BIN_DIR --sp-path $TPCC_SP_PATH"
+LOAD_SP="${TPCC_DIR}/mysql_load_sp.sh --host ${MASTER} --port ${MASTER_PORT}"
+LOAD_SP="${LOAD_SP} --user root --log ${LOGFILE} --client-path"
+LOAD_SP="${LOAD_SP} ${INSTALL_BIN_DIR} --sp-path ${TPCC_SP_PATH}"
#Run explain
-PLAN="$TPCC_DIR/mysql_dbt2_plans.sh --log $EXPLAINLOG"
-PLAN="$PLAN --client-path $INSTALL_BIN_DIR --host $MASTER --port $MASTER_PORT"
+PLAN="${TPCC_DIR}/mysql_dbt2_plans.sh --log ${EXPLAINLOG}"
+PLAN="${PLAN} --client-path ${INSTALL_BIN_DIR} --host ${MASTER} --port ${MASTER_PORT}"
#TPCC Test Driver
-TPCC_DRIVER="$TPCC_DIR/run_mysql.sh --connections $NUM_CONNECTIONS"
-TPCC_DRIVER="$TPCC_DRIVER --time $TEST_RUN_TIME"
-TPCC_DRIVER="$TPCC_DRIVER --warehouses $NUM_WAREHOUSE"
-TPCC_DRIVER="$TPCC_DRIVER --log-file $LOGFILE"
-TPCC_DRIVER="$TPCC_DRIVER --lib-client-path $INSTALL_LIB_DIR"
-TPCC_DRIVER="$TPCC_DRIVER --log-dir $TESTCASE_LOG_DIR"
-TPCC_DRIVER="$TPCC_DRIVER --host $MASTER --port $MASTER_PORT"
-TPCC_DRIVER="$TPCC_DRIVER --test-path $TPCC_DIR/$DB"
-TPCC_DRIVER="$TPCC_DRIVER --results-file $RF --zero-delay"
-TPCC_DRIVER="$TPCC_DRIVER --stack-size $STACK_SIZE"
-TPCC_DRIVER="$TPCC_DRIVER --csv-file $CSV_FILE"
+DRIVER="${TPCC_DIR}/run_mysql.sh --connections ${NUM_CONNECTIONS}"
+DRIVER="${DRIVER} --time ${TEST_RUN_TIME}"
+DRIVER="${DRIVER} --warehouses ${NUM_WAREHOUSE}"
+DRIVER="${DRIVER} --log-file ${LOGFILE}"
+DRIVER="${DRIVER} --lib-client-path ${INSTALL_LIB_DIR}"
+DRIVER="${DRIVER} --log-dir ${TESTCASE_LOG_DIR}"
+DRIVER="${DRIVER} --host ${MASTER} --port ${MASTER_PORT}"
+DRIVER="${DRIVER} --test-path ${TPCC_DIR}/${DB}"
+DRIVER="${DRIVER} --results-file ${RF} --zero-delay"
+DRIVER="${DRIVER} --stack-size ${STACK_SIZE}"
+DRIVER="${DRIVER} --csv-file ${CSV_FILE}"
INIT_RDB="${INIT_RDB} -testN TPC-C -pk ${PK_FILE} -l ${LOGFILE}"
INIT_RDB="${INIT_RDB} -testP test/tpcc/dbt2 -testS tpcc-tester-bm.sh"
@@ -90,22 +92,32 @@ UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFO_FILE} -re ${PERF_REPORT}"
-line(){
+OPS_TIMER="${OPS_TIMER} --testName=TPC-C"
+
+#----------------------
+# Script Functions
+#----------------------
+
+line()
+{
echo ${LINE} >> ${LOGFILE}
}
-end_time(){
+end_time()
+{
ENDTIME=`date +'%F %T'`
echo "end->${ENDTIME}" >> ${INFO_FILE}
}
-print_date(){
+print_date()
+{
line
date >> ${LOGFILE}
line
}
-failed(){
+failed()
+{
print_date
echo "exit->1" >> ${INFO_FILE}
end_time
@@ -116,31 +128,37 @@ failed(){
exit 1
}
-data(){
+data()
+{
line
echo "Script -> Creating DBT2 Data for load.." >> ${LOGFILE}
- ${TPCC_DATAGEN} >> ${LOGFILE}
+ ${DATAGEN} >> ${LOGFILE}
}
-load(){
+load()
+{
line
echo "Script -> Calling Load TPCC.." >> ${LOGFILE}
- ${LOAD_TPCC}
- RC=$?
+ ${OPS_TIMER} --testOp="CREATE & LOAD DB"
+ ${LOAD}
+ RC=${?}
if [ ${RC} -ne 0 ]; then
+ ${OPS_TIMER} --end
echo "Script -> Load failed" >> ${LOGFILE}
failed
fi
+ ${OPS_TIMER} --end
echo "Script -> Loading TPCC Store Procedures.." >> ${LOGFILE}
${LOAD_SP}
- RC=$?
+ RC=${?}
if [ ${RC} -ne 0 ]; then
echo "Script -> Load SP failed" >> $LOGFILE
failed
fi
}
-remove_data(){
+remove_data()
+{
if [ -d ${TPCC_DATA} ];then
PWD=`pwd`
cd ${TPCC_DATA}
@@ -149,76 +167,102 @@ remove_data(){
fi
}
-plan(){
+plan()
+{
line
echo "Script -> Running Explain" >> ${LOGFILE}
${PLAN}>> ${LOGFILE}
}
-run(){
+run()
+{
line
echo "Script -> Running Test" >> ${LOGFILE}
- ${TPCC_DRIVER}
- RC=$?
+ ${DRIVER}
+ RC=${?}
if [ ${RC} -ne 0 ]; then
echo "Script -> TPCC run failed!!!!!" >> $LOGFILE
failed
fi
}
-clean(){
+clean()
+{
line
echo "Script -> Dropping TPCC database.." >> ${LOGFILE}
- MYSQL_MASTER < ${DROP_DB} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --TestOp="DROP DB"
+ ${MYSQL_MASTER} < ${DROP_DB} >> ${LOGFILE} 2>&1
+ ${OPS_TIMER} --end
+}
+
+header()
+{
+ print_date
+ echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> tpcc-tester.sh..."
+ echo "Script -> tpcc-tester.sh is running..." > ${LOGFILE}
+}
+
+finish()
+{
+ print_date
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+}
+
+update_info()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo "name->TPC-C" > ${INFO_FILE}
+ echo "testType->PERFORMANCE" >> ${INFO_FILE}
+ echo "tag->TPM" >> ${INFO_FILE}
+ echo "dataType->float" >> ${INFO_FILE}
+ echo "description->PERFORMANCE TESTING" >> ${INFO_FILE}
+ echo "tr-description->OLTP TESTING" >> ${INFO_FILE}
+ STARTTIME=`date +'%F %T'`
+ echo "start->${STARTTIME}" >> ${INFO_FILE}
+ echo ${INIT_RDB} >> ${LOGFILE}
+ line
+ ${INIT_RDB}
+ fi
+}
+
+update_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ echo "exit->0" >> ${INFO_FILE}
+ ${UPDATE_RDB}
+ fi
}
-############################
+results_rpt()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ ${RESULTS_REPORT}
+ fi
+}
+
+#-----------
# Run Tests
-###########################
-echo "Script -> tpcc-tester.sh..."
-echo "Script -> tpcc-tester.sh is running..." > ${LOGFILE}
-print_date
-echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+#-----------
+
+header
data
load
remove_data
plan
-#----------Update Information file and INIT BM DB--------
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo "name->TPC-C" >> ${INFO_FILE}
- echo "testType->PERFORMANCE" >> ${INFO_FILE}
- echo "tag->TPM" >> ${INFO_FILE}
- echo "dataType->float" >> ${INFO_FILE}
- echo "description->PERFORMANCE TESTING" >> ${INFO_FILE}
- echo "tr-description->OLTP TESTING" >> ${INFO_FILE}
- STARTTIME=`date +'%F %T'`
- echo "start->${STARTTIME}" >> ${INFO_FILE}
- echo ${INIT_RDB} >> ${LOGFILE}
- line
- ${INIT_RDB}
-fi
-line
-#------------------------------------------
+update_info
run
-#----------Update Information file and BM DB--------
end_time
-line
-echo ${UPDATE_RDB} >> ${LOGFILE}
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo "exit->0" >> ${INFO_FILE}
- ${UPDATE_RDB}
-fi
-line
-#------------------------------------------
+update_bm
clean
-line
-echo ${RESULTS_REPORT} >> ${LOGFILE}
-if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- ${RESULTS_REPORT}
-fi
-line
-print_date
-echo "NDBT_ProgramExit: OK"
-exit 0
+results_rpt
+finish
+#-------------
#End of script
+#-------------
=== modified file 'in-queue.txt'
--- a/in-queue.txt 2008-12-17 15:05:57 +0000
+++ b/in-queue.txt 2009-02-13 21:08:34 +0000
@@ -1 +0,0 @@
-
=== removed file 'nohup.out'
--- a/nohup.out 2008-12-17 15:05:57 +0000
+++ b/nohup.out 1970-01-01 00:00:00 +0000
@@ -1,183 +0,0 @@
-*****************************************************************
-****************** Config File Start ****************************
-*****************************************************************
-*****************************************************************
-****************** Config File END ******************************
-*****************************************************************
-Thu Oct 30 18:38:59 CET 2008 starting ./scripts/dequeue.sh
-Thu Oct 30 18:41:29 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt
-Thu Oct 30 19:44:42 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-6
-Thu Oct 30 20:22:40 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-8
-Thu Oct 30 20:53:42 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn-mt-8
-Thu Oct 30 22:13:08 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-6
-Thu Oct 30 22:51:47 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-8
-Thu Oct 30 23:39:51 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn-mt-8
-Fri Oct 31 01:01:30 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Oct 31 04:38:11 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Oct 31 08:28:25 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Oct 31 12:26:48 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Oct 31 16:23:49 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Oct 31 20:18:54 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Oct 31 23:33:12 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-6
-Sat Nov 1 00:02:36 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt
-Sat Nov 1 00:36:18 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-8
-Sat Nov 1 01:55:16 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf stress
-Sat Nov 1 08:33:18 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-8
-Sun Nov 2 19:01:26 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sun Nov 2 22:36:48 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 3 02:26:14 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 3 06:25:11 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 3 10:25:12 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 3 14:24:07 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 3 17:43:42 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 3 21:20:15 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 4 01:00:10 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 4 04:58:16 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 4 08:54:55 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 4 12:50:14 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 4 16:09:52 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 4 18:42:40 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 4 20:28:22 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 4 22:19:16 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 4 23:50:36 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Nov 5 01:16:16 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Nov 5 01:49:01 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Nov 5 05:26:09 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Nov 5 06:51:04 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Nov 5 10:41:35 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Nov 5 14:40:02 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Nov 5 18:34:40 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Nov 5 22:32:55 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Thu Nov 6 01:01:48 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 6 03:10:07 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 6 04:35:21 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 6 06:00:33 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 6 07:43:44 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 6 08:15:36 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Nov 6 11:01:51 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Mon Nov 10 01:02:22 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 10 04:43:18 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 10 08:39:57 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 10 12:44:36 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 10 18:51:05 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 10 22:52:39 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 11 02:18:01 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 11 02:59:38 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 11 03:30:02 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 11 04:00:27 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 11 04:32:03 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 11 05:15:41 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 13 01:02:17 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Nov 13 03:53:36 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Nov 13 06:38:33 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 13 08:46:08 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 13 10:27:15 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 13 12:10:56 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 13 13:56:36 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 13 18:30:21 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Thu Nov 13 19:03:36 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Thu Nov 13 22:56:15 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Nov 14 02:09:27 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Nov 14 06:29:55 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Nov 14 10:47:35 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Nov 14 15:04:09 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Nov 14 17:43:50 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Nov 14 21:39:13 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Nov 15 01:48:27 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Nov 15 06:08:34 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Nov 15 10:25:03 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Nov 15 14:41:30 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Nov 15 18:18:42 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-8
-Sat Nov 15 20:04:44 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-6
-Sat Nov 15 21:11:02 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf stress
-Sun Nov 16 03:46:51 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt
-Mon Nov 17 01:02:30 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 17 04:53:50 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 17 09:06:53 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 17 13:25:58 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 17 17:41:00 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Nov 17 21:53:52 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 18 02:14:57 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 18 06:33:12 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Nov 18 10:09:54 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 18 15:09:38 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Nov 18 19:55:31 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Nov 19 00:11:10 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Nov 19 04:32:12 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Nov 19 09:09:00 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Nov 19 09:41:37 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Nov 19 13:37:10 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Nov 19 17:48:41 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Nov 19 22:08:42 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Thu Nov 20 02:25:31 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Dec 3 04:14:06 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Dec 3 15:11:56 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Dec 3 15:12:26 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Dec 3 15:12:56 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Dec 3 15:13:26 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Wed Dec 3 15:13:56 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Thu Dec 4 01:02:29 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Dec 4 01:02:59 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Dec 4 01:03:29 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Dec 4 01:03:59 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Dec 4 01:04:29 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Dec 4 01:04:59 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Thu Dec 4 19:24:34 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Thu Dec 4 20:23:05 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Dec 5 00:44:54 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Dec 5 05:11:08 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Dec 5 09:27:18 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Dec 5 13:39:02 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Dec 5 17:21:24 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt
-Fri Dec 5 19:04:08 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Dec 5 22:56:21 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Dec 6 03:01:07 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Dec 6 07:16:49 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Dec 6 11:18:17 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Dec 6 15:34:11 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Sat Dec 6 19:16:57 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf stress
-Sun Dec 7 01:54:40 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-6
-Sun Dec 7 03:38:38 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-8
-Sun Dec 7 05:49:37 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt
-Mon Dec 8 01:02:30 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Dec 8 04:59:12 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Dec 8 09:11:02 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Dec 8 13:25:17 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Dec 8 17:38:02 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Mon Dec 8 21:49:21 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Tue Dec 9 01:24:30 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Dec 9 06:39:29 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Dec 9 11:25:35 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Dec 9 15:34:37 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Dec 9 19:57:46 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Dec 10 00:32:33 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Wed Dec 10 14:16:07 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-ndb --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-telco-6.4
-Wed Dec 10 15:47:15 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-telco-6.4
-Wed Dec 10 19:58:08 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-telco-6.4
-Thu Dec 11 00:31:49 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-telco-6.4
-Thu Dec 11 04:33:54 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-bka-preview --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-telco-6.4
-Thu Dec 11 08:03:16 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt
-Thu Dec 11 09:52:42 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-6
-Thu Dec 11 11:59:59 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn-mt-6
-Thu Dec 11 13:55:18 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-8
-Thu Dec 11 15:44:04 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn-mt-8
-Thu Dec 11 18:02:18 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Thu Dec 11 22:37:46 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Dec 12 02:58:44 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn
-Fri Dec 12 07:19:08 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Fri Dec 12 12:19:28 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn
-Fri Dec 12 17:41:07 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt
-Fri Dec 12 18:00:54 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf stress
-Fri Dec 12 18:20:32 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn-mt-6
-Fri Dec 12 18:40:10 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 4-dn-mt-8
-Fri Dec 12 20:29:30 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-8
-Fri Dec 12 22:18:09 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-mt-6
-Mon Dec 15 01:02:10 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-old
-Mon Dec 15 23:11:49 CET 2008:
-Tue Dec 16 01:01:19 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Dec 16 05:17:26 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Dec 16 09:42:16 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-6.0-telco --CONF=/space/cluster_rep_auto/cr-autotest.conf clst-rep
-Tue Dec 16 14:17:39 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.2 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-old
-Tue Dec 16 18:32:17 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-perf
-Tue Dec 16 21:08:26 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.3 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-func
-Wed Dec 17 00:00:34 CET 2008: /bin/sh -x /space/cluster_rep_auto/scripts/boot.sh --clone=mysql-5.1-telco-6.4 --CONF=/space/cluster_rep_auto/cr-autotest.conf 2-dn-perf
=== modified file 'scripts/boot.sh'
--- a/scripts/boot.sh 2008-12-17 15:05:57 +0000
+++ b/scripts/boot.sh 2009-02-13 21:08:34 +0000
@@ -39,12 +39,16 @@ do
--conf=*) CONF=`echo $1 | sed s/--conf=//`;;
--CONF=*) CONF=`echo $1 | sed s/--CONF=//`;;
--clone=*) CLONE=`echo $1 | sed s/--clone=//`;;
+ --debug) DEBUG="yes";;
--install-exit)INSTALL_EXIT="yes";;
--leave-clone) REMOVE_CLONE="";;
--no-build) DO_BUILD="";;
--no-clone) DO_CLONE="";;
--no-tests) BUILD_TESTS="";;
- --revision=*) REVID=`echo $1 | sed s/--revision=//`;;
+ --rerun) RERUN=true;;
+ --revid=*) REVID=`echo $1 | sed s/--revid=//`;;
+ --revno=*) REVNO=`echo $1 | sed s/--revno=//`;;
+ --revtag=*) REVTAG=`echo $1 | sed s/--revtag=//`;;
--run=*) RUN=`echo $1 | sed s/--run=//`;;
--start-and-exit) START_EXIT="yes";;
--verbose) verbose=`expr $verbose + 1`;;
@@ -80,7 +84,9 @@ load_config()
#############################################
clean()
{
- sh -x ${CLEANER} --after-test --conf=${CONF} --clone=${CLONE} --run=${RUN}
+ if [ "${RERUN}" != "true" ];then
+ sh -x ${CLEANER} --after-test --conf=${CONF} --clone=${CLONE} --run=${RUN}
+ fi
}
#############################################
# Create and export vars
@@ -174,6 +180,10 @@ clones()
cd ${CLONE_DIR}
if [ "${REVID}" ];then
bzr branch -r revid:${REVID} ${CLONE} ${DST_PLACE}
+ elif [ "${REVNO}" ];then
+ bzr branch -r revno:${REVNO} ${CLONE} ${DST_PLACE}
+ elif [ "${REVTAG}" ];then
+ bzr branch -r tag:${REVTAG} ${CLONE} ${DST_PLACE}
else
bzr branch ${CLONE} ${DST_PLACE}
fi
@@ -217,7 +227,11 @@ build()
cd ${DST_PLACE}
max_configs="${max_configs} --with-ndbcluster"
export max_configs
- BUILD/${BUILD_SCRIPT} --prefix=${INSTALL_DIR}
+ if [ "${DEBUG}" ];then
+ ./BUILD/${BUILD_SCRIPT} --prefix=${INSTALL_DIR} --with-debug=full
+ else
+ ./BUILD/${BUILD_SCRIPT} --prefix=${INSTALL_DIR}
+ fi
make install
if [ "${BUILD_TESTS}" ];then
@@ -287,6 +301,11 @@ run()
RUN_ATRT="sh -x ${RUNNER} --CONF=${CONF} --clone=${CLONE}"
RUN_ATRT="${RUN_ATRT} --suite=${RUN}"
+ if [ "${RERUN}" ];then
+ RUN_ATRT="${RUN_ATRT} --rerun"
+ fi
+
+
${RUN_ATRT}
RC=$?
=== modified file 'scripts/cleanup.sh'
--- a/scripts/cleanup.sh 2008-12-17 15:05:57 +0000
+++ b/scripts/cleanup.sh 2009-02-13 21:08:34 +0000
@@ -33,6 +33,7 @@ do
--logs) LOGS_REPORTS=true;;
--remove-run) REMOVERUNDIR=ture;;
--results-dir=*) RES_DIR=`echo $1 | sed s/--results-dir=//`;;
+ --rerun) RERUN=true;;
--run=*) RUN=`echo $1 | sed s/--run=//`;;
--suite=*) RUN=`echo $1 | sed s/--suite=//`;;
--test) TESTSUITE=true;;
@@ -61,7 +62,8 @@ fi
#############################################################
### setup vars ###
#############################################################
-init_vars(){
+init_vars()
+{
INFO_FILE=${RES_DIR}/cr-info.txt
RES_HOLD=${RES_DIR}/hold
RES_TMP_DIR=${RES_DIR}/tmp
@@ -81,77 +83,83 @@ fi
#############################################################
### Remove Temp Files ###
#############################################################
-remove_tmp_files(){
-echo "remove_tmp_files"
-TMP_TOTAL=`ls ${TEST_TMP_DIR} |wc -l`
-if [ ${TMP_TOTAL} -gt 0 ]; then
- if [ -n "${TEST_TMP_DIR}" ]; then
- rm -f ${TEST_TMP_DIR}/*
- else
- echo "remove_tmp_files failed"
+remove_tmp_files()
+{
+ echo "remove_tmp_files"
+ TMP_TOTAL=`ls ${TEST_TMP_DIR} |wc -l`
+ if [ ${TMP_TOTAL} -gt 0 ]; then
+ if [ -n "${TEST_TMP_DIR}" ]; then
+ rm -f ${TEST_TMP_DIR}/*
+ else
+ echo "remove_tmp_files failed"
+ fi
fi
-fi
}
#############################################################
### Remove Test Lock File ###
#############################################################
-remove_lock_file(){
-echo "remove_lock_file"
-if [ -f ${LOCK} ];then
- rm -f ${LOCK}
-fi
+remove_lock_file()
+{
+ echo "remove_lock_file"
+ if [ -f ${LOCK} ];then
+ rm -f ${LOCK}
+ fi
}
#############################################################
### Remove the results directory ###
#############################################################
-remove_results_dir(){
-echo "remove_results_dir"
-if [ -n ${RES_DIR} ]; then
- if [ -d ${RES_DIR} ]; then
- rm -rf ${RES_DIR}
+remove_results_dir()
+{
+ echo "remove_results_dir"
+ if [ -n ${RES_DIR} ]; then
+ if [ -d ${RES_DIR} ]; then
+ rm -rf ${RES_DIR}
+ fi
+ else
+ echo "remove_results_dir() failed"
fi
-else
- echo "remove_results_dir() failed"
-fi
}
#############################################################
### Remove Install Directories ###
#############################################################
-remove_install_dir(){
-echo "remove_install_dir"
-if [ -n ${INSTALL_DIR} ]; then
- if [ -d ${INSTALL_DIR} ]; then
- while [ $# -gt 0 ]
- do
- ssh $1 "rm -rf ${INSTALL_DIR}"
- shift
- done
+remove_install_dir()
+{
+ echo "remove_install_dir"
+ if [ -n ${INSTALL_DIR} ]; then
+ if [ -d ${INSTALL_DIR} ]; then
+ while [ $# -gt 0 ]
+ do
+ ssh $1 "rm -rf ${INSTALL_DIR}"
+ shift
+ done
+ fi
+ else
+ echo "remove_install_dir() failed"
fi
-else
- echo "remove_install_dir() failed"
-fi
}
#############################################################
### Remove Run Directories ###
#############################################################
-remove_run_dir(){
-echo "remove_run_dir"
-if [ -n ${RUN_DIR} ]; then
- if [ "${RUN_DIR}" ]; then
- while [ $# -gt 0 ]
- do
- ssh $1 "rm -rf ${RUN_DIR}"
- shift
- done
+remove_run_dir()
+{
+ echo "remove_run_dir"
+ if [ -n ${RUN_DIR} ]; then
+ if [ "${RUN_DIR}" ]; then
+ while [ $# -gt 0 ]
+ do
+ ssh $1 "rm -rf ${RUN_DIR}"
+ shift
+ done
+ fi
+ else
+ echo "remove_run_dir() failed"
fi
-else
- echo "remove_run_dir() failed"
-fi
}
#############################################################
### Save Logs and Reports ###
#############################################################
-logs_reports(){
+logs_reports()
+{
### Create test information file
echo "date=${SAVE_DATE2}" > ${INFO_FILE}
@@ -226,6 +234,7 @@ logs_reports(){
if [ "${POST_RESULTS}" ];then
rsync -qa ${RES_DIR} ${RESULT_HOST}:${RESULT_PATH}/result-${RUN}-${CLONE}/
+ rm -rf ${RES_DIR}
if [ -f ${RUNLOG} ]; then
rsync -qa ${RUNLOG} ${RESULT_HOST}:${RESULT_PATH}/result-${RUN}-${CLONE}/${SAVE_DATE2}
fi
@@ -237,145 +246,144 @@ logs_reports(){
#############################################################
### save system directories ###
#############################################################
-save_file_system(){
-echo "save_file_system"
-if [ ! -d ${RES_DIR_ROOT} ]; then
- mkdir ${RES_DIR_ROOT}
-fi
-if [ ! -d ${RES_DIR} ]; then
- mkdir ${RES_DIR}
-fi
-
-if [ "${STATUS}" = "run" ];then
- while [ $# -gt 0 ]
- do
- dir_exists=`ssh $1 "ls -d ${INSTALL_DIR} |wc -l"`
- if [ ${dir_exists} -gt 0 ]; then
- rsync -qa $1:${INSTALL_DIR}/run* ${RES_DIR}
- fi
- shift
- done
-fi
-
-if [ -f ${RUNLOG} ];then
- cp ${RUNLOG} ${RES_DIR}/ACRT-RUN-${SAVE_DATE2}-FAILED
-fi
-if [ -f ${ATRT_LOG} ]; then
- mv ${ATRT_LOG} ${RES_DIR}
-fi
-rsync -qa ${RES_DIR} ${RESULT_HOST}:${RESULT_PATH}/result-${RUN}-${CLONE}/
+save_file_system()
+{
+ echo "save_file_system"
+ if [ ! -d ${RES_DIR_ROOT} ]; then
+ mkdir ${RES_DIR_ROOT}
+ fi
+ if [ ! -d ${RES_DIR} ]; then
+ mkdir ${RES_DIR}
+ fi
+ if [ "${STATUS}" = "run" ];then
+ while [ $# -gt 0 ]
+ do
+ dir_exists=`ssh $1 "ls -d ${INSTALL_DIR} |wc -l"`
+ if [ ${dir_exists} -gt 0 ]; then
+ rsync -qa $1:${INSTALL_DIR}/run* ${RES_DIR}
+ fi
+ shift
+ done
+ fi
+ if [ -f ${RUNLOG} ];then
+ cp ${RUNLOG} ${RES_DIR}/ACRT-RUN-${SAVE_DATE2}-FAILED
+ fi
+ if [ -f ${ATRT_LOG} ]; then
+ mv ${ATRT_LOG} ${RES_DIR}
+ fi
+ rsync -qa ${RES_DIR} ${RESULT_HOST}:${RESULT_PATH}/result-${RUN}-${CLONE}/
}
###########################
# Remove Data Directories #
###########################
-remove_data_dir(){
-echo "remove_data_dir"
-if [ -d ${RUN_DIR}/run/ndb_2_fs ]; then
- ssh ${MASTER} "rm -rf ${RUN_DIR}/run/ndb_*_fs"
- ssh ${SLAVE} "rm -rf ${RUN_DIR}/run/ndb_*_fs"
-else
- while [ $# -gt 0 ]
- do
- ssh $1 "rm -rf /data1/ndb*"
- ssh $1 "rm -rf /data2/ndb*"
- shift
- done
-fi
+remove_data_dir()
+{
+ echo "remove_data_dir"
+ if [ -d ${RUN_DIR}/run/ndb_2_fs ]; then
+ ssh ${MASTER} "rm -rf ${RUN_DIR}/run/ndb_*_fs"
+ ssh ${SLAVE} "rm -rf ${RUN_DIR}/run/ndb_*_fs"
+ else
+ while [ $# -gt 0 ]
+ do
+ ssh $1 "rm -rf /data1/ndb*"
+ ssh $1 "rm -rf /data2/ndb*"
+ shift
+ done
+ fi
+}
+
+remove_builds()
+{
+ if [ -d ${BUILD_DIR} ];then
+ COUNT=`ls ${BUILD_DIR}/* |wc -l`
+ if [ ${COUNT} -ne 0 ]; then
+ cd ${BUILD_DIR}
+ rm -rf *
+ fi
+ fi
}
#############################################################
### Test suite Clean Up ###
#############################################################
-test_clean(){
-
-if [ -f ${RUNLOG} ]; then
- rm -f ${RUNLOG}
-fi
-
-if [ -f ${ATRT_LOG} ]; then
- rm -f ${ATRT_LOG}
-fi
-
-#Cleanup any left over data files
-COUNT=`ls ${TEST_SCRIPTS_DIR}/tpcc/data/ |wc -l`
-if [ ${COUNT} -ne 0 ]; then
- cd ${TEST_SCRIPTS_DIR}/tpcc/data/
- rm -f *
-fi
-
-COUNT=`ls ${TEST_SCRIPTS_DIR}/joinAtomics/data |wc -l`
-if [ ${COUNT} -ne 0 ]; then
- cd ${TEST_SCRIPTS_DIR}/joinAtomics/data
- rm -f *
-fi
-
-COUNT=`ls ${TEST_SCRIPTS_DIR}/cge/data |wc -l`
-if [ ${COUNT} -ne 0 ]; then
- cd ${TEST_SCRIPTS_DIR}/cge/data
- rm -rf *
-fi
-
-#Cleanup the tests compiled files
-cd ${TEST_SCRIPTS_DIR}/tpcc/dbt2
-if [ -f "Makefile" ]; then
- make distclean
-fi
-
-cd ${TEST_SCRIPTS_DIR}/benchmark/sysbench-0.4.8
-if [ -f "Makefile" ]; then
- make clean
-fi
-
-cd ${TEST_SCRIPTS_DIR}/joinAtomics/src
-if [ -f "Makefile" ]; then
- make clean
-fi
-
-cd ${TEST_SCRIPTS_DIR}/cge
-if [ -f "Makefile" ]; then
- make clean
-fi
-
-cd ${TEST_SCRIPTS_DIR}/tpcb/tpcbSql_src/src
-if [ -f "Makefile" ]; then
- make clean
-fi
-
-
-#Cleanup misc directories and files
-COUNT=`ls -1A ${TEST_TMP_DIR} | wc -l`
-if [ ${COUNT} -ne 0 ];then
- cd ${TEST_TMP_DIR}
- rm -rf *
-fi
-
-COUNT=`ls -1A ${TESTCASE_LOG_DIR} | wc -l`
-if [ ${COUNT} -ne 0 ];then
- cd ${TESTCASE_LOG_DIR}
- rm -rf *
-fi
-
-HISTORY=${MAIN_TEST_DIR}/history.txt
-if [ -f ${HISTORY} ];then
- rm -f ${HISTORY}
-fi
-
-cd ${PWD}
+test_clean()
+{
+ if [ -f ${RUNLOG} ]; then
+ rm -f ${RUNLOG}
+ fi
+ if [ -f ${ATRT_LOG} ]; then
+ rm -f ${ATRT_LOG}
+ fi
+ #Cleanup any left over data files
+ COUNT=`ls ${TEST_SCRIPTS_DIR}/tpcc/data/ |wc -l`
+ if [ ${COUNT} -ne 0 ]; then
+ cd ${TEST_SCRIPTS_DIR}/tpcc/data/
+ rm -f *
+ fi
+ COUNT=`ls ${TEST_SCRIPTS_DIR}/joinAtomics/data |wc -l`
+ if [ ${COUNT} -ne 0 ]; then
+ cd ${TEST_SCRIPTS_DIR}/joinAtomics/data
+ rm -f *
+ fi
+ COUNT=`ls ${TEST_SCRIPTS_DIR}/cge/data |wc -l`
+ if [ ${COUNT} -ne 0 ]; then
+ cd ${TEST_SCRIPTS_DIR}/cge/data
+ rm -rf *
+ fi
+ #Cleanup the tests compiled files
+ cd ${TEST_SCRIPTS_DIR}/tpcc/dbt2
+ if [ -f "Makefile" ]; then
+ make distclean
+ fi
+ cd ${TEST_SCRIPTS_DIR}/benchmark/sysbench-0.4.8
+ if [ -f "Makefile" ]; then
+ make clean
+ fi
+ cd ${TEST_SCRIPTS_DIR}/joinAtomics/src
+ if [ -f "Makefile" ]; then
+ make clean
+ fi
+ cd ${TEST_SCRIPTS_DIR}/cge
+ if [ -f "Makefile" ]; then
+ make clean
+ fi
+ cd ${TEST_SCRIPTS_DIR}/tpcb/tpcbSql_src/src
+ if [ -f "Makefile" ]; then
+ make clean
+ fi
+ #Cleanup misc directories and files
+ COUNT=`ls -1A ${TEST_TMP_DIR} | wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ cd ${TEST_TMP_DIR}
+ rm -rf *
+ fi
+ COUNT=`ls -1A ${TESTCASE_LOG_DIR} | wc -l`
+ if [ ${COUNT} -ne 0 ];then
+ cd ${TESTCASE_LOG_DIR}
+ rm -rf *
+ fi
+ HISTORY=${MAIN_TEST_DIR}/history.txt
+ if [ -f ${HISTORY} ];then
+ rm -f ${HISTORY}
+ fi
+ cd ${PWD}
}
#############################################################
### Error Traper ###
#############################################################
-error_trap(){
- echo "${CLEANER} trapped an error"
- remove_install_dir ${HOSTS}
- remove_data_dir ${HOSTS}
- remove_tmp_files
- remove_lock_file
- exit 0
+error_trap()
+{
+ echo "${CLEANER} trapped an error"
+ remove_install_dir ${HOSTS}
+ remove_data_dir ${HOSTS}
+ remove_tmp_files
+ remove_lock_file
+ exit 0
}
#############################################################
### After Testing Clean Up ###
#############################################################
-after_testing(){
+after_testing()
+{
remove_install_dir ${HOSTS}
#remove_results_dir
remove_data_dir ${HOSTS}
@@ -383,21 +391,36 @@ after_testing(){
remove_lock_file
exit 0
}
+
+#############################################################
+### Test rerun Clean Up ###
+#############################################################
+rerun_cleanup()
+{
+ remove_data_dir ${HOSTS}
+ remove_tmp_files
+ remove_lock_file
+ exit 0
+}
+
#############################################################
### Full Framework Clean Up ###
#############################################################
-full_cleanup(){
+full_cleanup()
+{
remove_install_dir ${HOSTS}
remove_results_dir
remove_data_dir ${HOSTS}
test_clean
+ remove_builds
remove_lock_file
exit 0
}
#############################################################
### Boot Failed ###
#############################################################
-boot_process_failed(){
+boot_process_failed()
+{
save_file_system ${HOSTS}
remove_install_dir ${HOSTS}
if [ -n ${DST_PLACE} ]; then
@@ -469,6 +492,19 @@ if [ "${FULL}" ]; then
full_cleanup
fi
+if [ "${RERUN}" ];then
+ if [ "${LOGS_REPORTS}" ]; then
+ TESTFORLOGS=`ls -1A ${TESTCASE_LOG_DIR} | wc -l`
+ if [ ${TESTFORLOGS} != 0 ]; then
+ if [ -n "${RES_DIR}" ]; then
+ logs_reports
+ fi
+ fi
+ fi
+ rerun_cleanup
+ exit 0
+fi
+
echo "Nothing done"
exit 1
=== modified file 'scripts/clones.sh'
--- a/scripts/clones.sh 2008-12-17 15:05:57 +0000
+++ b/scripts/clones.sh 2009-02-13 21:08:34 +0000
@@ -1 +1,2 @@
-TEST_CLONE="mysql-5.1-telco-6.3 mysql-5.1-telco-6.4 mysql-6.0-ndb"
+TEST_CLONE="mysql-5.1-telco-6.3 mysql-5.1-telco-6.4 mysql-6.0-telco-6.3 mysql-6.0-telco-6.4"
+# mysql-6.0-ndb"
=== modified file 'scripts/run_test.sh'
--- a/scripts/run_test.sh 2008-12-17 15:05:57 +0000
+++ b/scripts/run_test.sh 2009-02-13 21:08:34 +0000
@@ -32,6 +32,7 @@ do
--conf=*) CONF=`echo $1 | sed s/--conf=//`;;
--CONF=*) CONF=`echo $1 | sed s/--CONF=//`;;
--no-report) report="";;
+ --rerun) RERUN=true;;
--start-and-exit) START_EXIT=true;;
--suite=*) RUN=`echo $1 | sed s/--suite=//`;;
--verbose) VERBOSE=`expr $VERBOSE + 1`;;
@@ -179,12 +180,15 @@ choose_conf(){
elif [ -f ${CONFIGURATIONS}/conf-${RUN}.cnf ]
then
echo ${CONFIGURATIONS}/conf-${RUN}.cnf
- elif [ -f ${ATRT_DIR}/conf-cr.cnf ]
+ elif [ -f ${CONFIGURATIONS}/${RUN}.cnf ]
then
- echo "${ATRT_DIR}/conf-cr.cnf"
+ echo ${CONFIGURATIONS}/${RUN}.cnf
elif [ -f ${ATRT_DIR}/conf-${HOST}.cnf ]
then
echo "${ATRT_DIR}/conf-${HOST}.cnf"
+ elif [ -f ${ATRT_DIR}/conf-${RUN}.cnf ]
+ then
+ echo "${ATRT_DIR}/conf-${RUN}.cnf"
else
echo "*********************************************"
echo "******** ERROR! ERROR! ERROR! ***************"
@@ -203,7 +207,7 @@ choose_conf(){
#############################################################
### Count howmany test hosts we have ready ###
-#############################################################
+############################################################
count_hosts(){
#echo $1
@@ -227,6 +231,10 @@ cleanup(){
if [ `uname -s` != "SunOS" ]; then
trap - ERR
fi
+ if [ "${RERUN}" ];then
+ ${CLEANER} --rerun --logs --CONF=${CONF}
+ exit 0
+ fi
${CLEANER} --after-test --logs --CONF=${CONF}
}
@@ -365,7 +373,8 @@ done
trap - HUP INT QUIT PIPE TERM
trap start_exit_clean 2
fi
- $STARTER
+ cp ${RUN_DIR}/run/my.cnf ${MAIN_TEST_DIR}
+ $STARTER
exit 0
fi
cp $SAVE_OUT_LOG $ATRT_DIR
=== modified file 'tests/benchmark/sysbench-0.4.8/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/Makefile 2009-02-13 21:08:34 +0000
@@ -139,7 +139,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/config.log'
--- a/tests/benchmark/sysbench-0.4.8/config.log 2008-12-17 15:05:57 +0000
+++ b/tests/benchmark/sysbench-0.4.8/config.log 2009-02-13 21:08:34 +0000
@@ -748,7 +748,7 @@ configure: failed program was:
configure:20633: result: no
configure:20509: checking whether pthreads work without any flags
configure:20600: gcc -o conftest -g -O2 conftest.c >&5
-/tmp/cc2UuEio.o: In function `main':
+/tmp/ccSzs4VP.o: In function `main':
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:33: undefined reference to `pthread_join'
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:34: undefined reference to `__pthread_register_cancel'
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:35: undefined reference to `pthread_create'
@@ -798,7 +798,7 @@ configure:20633: result: no
configure:20514: checking whether pthreads work with -Kthread
configure:20600: gcc -o conftest -g -O2 -Kthread conftest.c >&5
gcc: unrecognized option '-Kthread'
-/tmp/ccgz7XuB.o: In function `main':
+/tmp/ccO8jjs2.o: In function `main':
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:33: undefined reference to `pthread_join'
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:34: undefined reference to `__pthread_register_cancel'
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:35: undefined reference to `pthread_create'
@@ -848,7 +848,7 @@ configure:20633: result: no
configure:20514: checking whether pthreads work with -kthread
configure:20600: gcc -o conftest -g -O2 -kthread conftest.c >&5
gcc: unrecognized option '-kthread'
-/tmp/cccE0T1U.o: In function `main':
+/tmp/ccmdsIfo.o: In function `main':
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:33: undefined reference to `pthread_join'
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:34: undefined reference to `__pthread_register_cancel'
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:35: undefined reference to `pthread_create'
@@ -978,7 +978,7 @@ configure:20978: result: /data0/cr_autot
configure:21010: checking MySQL C flags
configure:21013: result: -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
configure:21018: checking MySQL linker flags
-configure:21022: result: -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+configure:21022: result: -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
configure:21226: checking libaio.h usability
configure:21238: gcc -c -g -O2 conftest.c >&5
conftest.c:66:20: error: libaio.h: No such file or directory
@@ -1745,7 +1745,7 @@ configure:23925: $? = 0
configure:23936: result: yes
configure:23946: checking for library containing clock_gettime
configure:23976: gcc -o conftest -g -O2 conftest.c -lm >&5
-/tmp/ccqbZ8Jm.o: In function `main':
+/tmp/ccgWZ4Wk.o: In function `main':
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:68: undefined reference to `clock_gettime'
collect2: ld returned 1 exit status
configure:23982: $? = 1
@@ -1906,9 +1906,9 @@ configure:24173: $? = 0
configure:24185: result: yes
configure:24097: checking for thr_setconcurrency
configure:24154: gcc -o conftest -g -O2 conftest.c -lrt -lm >&5
-/tmp/cc0gm4O5.o: In function `main':
+/tmp/ccQvaesZ.o: In function `main':
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:104: undefined reference to `thr_setconcurrency'
-/tmp/cc0gm4O5.o:(.data+0x0): undefined reference to `thr_setconcurrency'
+/tmp/ccQvaesZ.o:(.data+0x0): undefined reference to `thr_setconcurrency'
collect2: ld returned 1 exit status
configure:24160: $? = 1
configure: failed program was:
@@ -2263,7 +2263,7 @@ LN_S='ln -s'
LTLIBOBJS=''
MAKEINFO='${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo'
MYSQL_CFLAGS='-I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX'
-MYSQL_LIBS='-rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm'
+MYSQL_LIBS='-rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm'
OBJEXT='o'
ORA_CFLAGS=''
ORA_LIBS=''
=== modified file 'tests/benchmark/sysbench-0.4.8/config.status'
--- a/tests/benchmark/sysbench-0.4.8/config.status 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/config.status 2009-02-13 21:08:34 +0000
@@ -579,7 +579,7 @@ s,@PTHREAD_CC@,gcc,;t t
s,@PTHREAD_LIBS@,,;t t
s,@PTHREAD_CFLAGS@,-pthread,;t t
s,@mysqlconfig@,/data0/cr_autotest/bin/mysql_config,;t t
-s,@MYSQL_LIBS@,-rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm,;t t
+s,@MYSQL_LIBS@,-rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm,;t t
s,@MYSQL_CFLAGS@,-I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX,;t t
s,@USE_MYSQL_TRUE@,,;t t
s,@USE_MYSQL_FALSE@,#,;t t
=== modified file 'tests/benchmark/sysbench-0.4.8/doc/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/doc/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/doc/Makefile 2009-02-13 21:08:34 +0000
@@ -107,7 +107,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/scripts/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/scripts/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/scripts/Makefile 2009-02-13 21:08:34 +0000
@@ -116,7 +116,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/Makefile 2009-02-13 21:08:34 +0000
@@ -154,7 +154,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/drivers/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/drivers/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/drivers/Makefile 2009-02-13 21:08:34 +0000
@@ -121,7 +121,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/drivers/mysql/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/drivers/mysql/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/drivers/mysql/Makefile 2009-02-13 21:08:34 +0000
@@ -134,7 +134,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/drivers/oracle/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/drivers/oracle/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/drivers/oracle/Makefile 2009-02-13 21:08:34 +0000
@@ -134,7 +134,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/drivers/pgsql/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/drivers/pgsql/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/drivers/pgsql/Makefile 2009-02-13 21:08:34 +0000
@@ -134,7 +134,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/tests/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/tests/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/Makefile 2009-02-13 21:08:34 +0000
@@ -121,7 +121,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/tests/cpu/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/tests/cpu/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/cpu/Makefile 2009-02-13 21:08:34 +0000
@@ -134,7 +134,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/tests/fileio/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/tests/fileio/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/fileio/Makefile 2009-02-13 21:08:34 +0000
@@ -135,7 +135,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/tests/memory/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/tests/memory/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/memory/Makefile 2009-02-13 21:08:34 +0000
@@ -134,7 +134,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/tests/mutex/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/tests/mutex/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/mutex/Makefile 2009-02-13 21:08:34 +0000
@@ -134,7 +134,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/tests/oltp/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/tests/oltp/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/oltp/Makefile 2009-02-13 21:08:34 +0000
@@ -134,7 +134,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== modified file 'tests/benchmark/sysbench-0.4.8/sysbench/tests/threads/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/sysbench/tests/threads/Makefile 2008-10-30 23:41:52 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/threads/Makefile 2009-02-13 21:08:34 +0000
@@ -134,7 +134,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/config/missing --run makeinfo
MYSQL_CFLAGS = -I/data0/cr_autotest/include/mysql -Wreturn-type -Wtrigraphs -W -Wformat -Wsign-compare -Wunused-function -Wunused-value -Wunused-parameter -fno-omit-frame-pointer -g -DUNIV_LINUX
-MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lrt -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== added directory 'tests/insert_delete'
=== added file 'tests/insert_delete/load_and_delete.pl'
--- a/tests/insert_delete/load_and_delete.pl 1970-01-01 00:00:00 +0000
+++ b/tests/insert_delete/load_and_delete.pl 2009-02-13 21:08:34 +0000
@@ -0,0 +1,891 @@
+#---------------------------------------------------------------------
+#/* Copyright (C) 2009 - 2014 Sun Microsystems
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Version 1.0
+#------------------------------------------------------------------------
+# Purpose: This application creates and loads a database, simple and blob
+# tables. It then inserts/deletes row by row and then deletes all
+# rows taking timing for all ops. The Storage engine currently
+# can be NDBCluster, InnoDB, or MyISAM, but is easly exanded
+# to use other storage engines.
+#------------------------------------------------------------------------
+#
+#-----------------------------------------------
+# Perl Includes
+#-----------------------------------------------
+use Time::Local;
+use Time::localtime;
+use DBI;
+use Getopt::Long;
+use IO::File;
+#-----------------------------------------------
+# Globals Vars
+#-----------------------------------------------
+our $host='localhost';
+our $port='3306';
+our $user='root';
+our $pass='';
+our $database='LIDD';
+our $dbhM='';
+our $aid=0;
+our $balance=5;
+our $rows=100000; #/should be changed for bigger databases
+our $engineType='NDB';
+our $lfgName='lg1';
+our $undoSize='250M';
+our $tsName='ts1';
+our $diskData=0;
+our $diskDataC=0;
+our $ddSize='500M';
+our $undoBuffer = '4M';
+our $numUndo=1;
+our $skipLFG=0;
+our $numData=2;
+our $sockPath='/tmp/mysql.sock';
+our $useSock=0;
+our $logFile='./loadDelete.log';
+our $rptFile='./loadDelete.rpt';
+our $csvFile="./loadDelete.csv";
+our $blobFile="./pic.jpg";
+our $failed=1;
+our $sth='';
+our $delInst=0;
+our $date=0;
+our $blob='';
+#-------------------------------------------------
+# Sub Pototypes
+#-------------------------------------------------
+
+#-- Script Functions ---
+sub main ();
+sub CollectCommandPromptInfo ();
+sub ConnectToDatabases ();
+sub DisconnectFromDatabase ();
+sub CreateDB ();
+sub DropDB ();
+sub DropDiskD ();
+sub CreateTables ();
+sub ShowVars ();
+sub Usage ();
+sub FailedSQL ($);
+sub SQL_ExecuteError ($$);
+sub FailedExit ($);
+#--- Simple Table ---
+sub LoadTableSimple ();
+sub DeleteFromTableSimple ();
+sub DeleteInsertSimple ();
+# --- Blob Table ---
+sub LoadTableBlob ();
+sub DeleteFromTableBlob ();
+sub DeleteInsertBlob ();
+#--- Logging ---
+sub LogMessage ($);
+sub LogCsv ($);
+sub LogReport ($);
+#--- File Ops ---
+sub OpenFileRead ($$);
+sub OpenFileAppend ($$);
+sub OpenFileForWrite ($$);
+sub CloseFile ($);
+sub GetBlob ();
+
+#--------------------------------------------------
+# Program Main
+#--------------------------------------------------
+
+main();
+
+sub main ()
+{
+ CollectCommandPromptInfo();
+ ConnectToDatabases();
+ CreateDB();
+ CreateTables();
+ LoadTableSimple();
+ if ($delInst > 0)
+ {
+ DeleteInsertSimple();
+ }
+ DeleteFromTableSimple();
+ LoadTableBlob();
+ if ($delInst > 0)
+ {
+ DeleteInsertBlob();
+ }
+ DeleteFromTableBlob();
+ DisconnectFromDatabase();
+ exit 0
+}
+
+#--------------------------------
+# Usage
+#--------------------------------
+sub Usage ()
+{
+ ShowVars();
+ die "\n\nProgram: Load Delete\n
+ usage: load_tpcb.pl
+ -he [--help] :print usage
+
+ -ho [--host=string] :host name (default localhost)
+
+ -us [--user=string] :user's name (default root)
+
+ -po [--port=int] :port (default 3306)
+
+ -so [--socket] :Connect using socket
+ (default false)
+
+ -sp [--spath=string] :socket path and file name
+ (default /tmp/mysql.sock)
+
+ -pa [--pass=string] :password | Note: leave -pa empty or do not
+ include for blank password
+ (default null/BLANK)
+
+ -e [--engine=string] :engine_type | See Below
+
+ -d [--database=string] :database name (default LIDD)
+
+ -re [--report=string] :File path and name for report
+
+ -c [--csv=string] :File path and name for csv
+
+ -log [--log=string] :File path and name for log
+
+ -ro [--row=#] :Number of rows to load/table.
+ (default == 100,000)
+
+ -i [insDel=#] :Number of rows to insert/delete
+
+ -lf [--lfgname=string] :Log File Group Name. (default lg1)
+
+ -numL [--numLFGUndo=#] :Number of LFG Undo Files. (default 1)
+
+ -un [--undoSize=#M/G] :Size of undo files
+
+ -sk [--skipLFGcreate] :Skip creating the LFG. Use if the LFG
+ already exists. (default false)
+
+ -tsN [--tsName=string] :Table Space Name.(default ts1)
+
+ -numT [--numTSData=#] :Number of Table Space Data Files. (default 2).
+
+ -tsS [--tsSize=#M/G] :Data File Size
+
+ Notes: engine == ndb, ndbdd(Disk Data), ndbcluster, InnoDB, MyISAM\n";
+}
+
+#--------------------------------
+# Show command line values
+#--------------------------------
+
+sub ShowVars ()
+{
+ ########## Show the user command line values for debugging #########
+ print "*********************************************\n";
+ print "************ Command-line values ************\n";
+ print "*********************************************\n";
+ print "Host ..................... $host\n";
+ print "User ..................... $user\n";
+ print "Password ................. $pass\n" if ($pass ne '');
+ print "Password ................. BLANK\n" if ($pass eq '');
+ print "Port ..................... $port\n";
+ print "Use Socket To Connect .... TRUE\n" if ($useSock);
+ print "Use Socket To Connect .... FALSE\n" if (!$useSock);
+ print "Socket Path .............. $sockPath\n" if ($useSock);
+ print "Database ................. $database\n";
+ print "Engine Type .............. $engineType\n";
+ print "Number of rows ........... $rows\n";
+ print "Log File ................. $logFile\n";
+ print "Csv File ................. $csvFile\n";
+ print "Report File .............. $rptFile\n";
+ print "Use Disk Data ............ TRUE\n" if ($diskData);
+ print "Use Disk Data ............ FALSE\n" if (!$diskData);
+ print "LFG Name ................. $lfgName\n" if ($diskData);
+ print "Create Log File Group .... TRUE\n" if ($diskData && !$skipLFG);
+ print "Create Log File Group .... FALSE\n" if ($diskData && $skipLFG);
+ print "Number LFG Undo File(s)... $numUndo\n" if ($diskData);
+ print "LFG Undo File(s)Size ..... $undoSize\n" if ($diskData);
+ print "Table Space Name ......... $tsName\n" if ($diskData);
+ print "Number TS Data Files(s)... $numData\n" if ($diskData);
+ print "TS Data Files(s) Size .... $ddSize\n" if ($diskData);
+}
+
+#--------------------------------
+# Collect Command Prompt Info
+#--------------------------------
+sub CollectCommandPromptInfo ()
+{
+
+ if (!GetOptions("help"=>\$help,
+ "host:s"=>\$host,
+ "user:s"=>\$user,
+ "port:i"=>\$port,
+ "socket"=>\$useSock,
+ "spath:s"=>\$sockPath,
+ "pass:s"=>\$pass,
+ "engine:s"=>\$engineType,
+ "database:s"=>\$database,
+ "lfgname:s"=>\$lfgName,
+ "numLFGUndo:i"=>\$numUndo,
+ "skipLFGcreate"=>\$skipLFG,
+ "tsName:s"=>\$tsName,
+ "numTSData:i"=>\$numData,
+ "undoSize:s"=>\$undoSize,
+ "tsSize:s"=>\$ddSize,
+ "rows:i"=>\$rows,
+ "log:s"=>\$logFile,
+ "csv:s"=>\$csvFile,
+ "report:s"=>\$rptFile,
+ "blob:s"=>\$blobFile,
+ "insDel:i"=>\$delInst))
+ {
+ Usage();
+ }
+ if ($help){Usage();}
+ if ($useSock){$ENV{MYSQL_UNIX_PORT} = $sockPath;}
+ if ($engineType ne 'ndb' && $engineType ne 'ndbcluster'
+ && $engineType ne 'InnoDB' && $engineType ne 'MyISAM'
+ && $engineType ne 'innodb' && $engineType ne 'myisam'
+ && $engineType ne 'NDBDD' && $engineType ne 'ndbdd'
+ && $engineType ne 'NDB' && $engineType ne 'NDBCLUSTER')
+ {
+ die Usage();
+ }
+ if ($engineType eq 'ndbdd' || $engineType eq 'NDBDD')
+ {
+ $engineType = "ndb"; $diskData = 1;
+ }
+ LogMessage("INSERT/DELETE -> CollectCommandPrompt Complete");
+}
+
+#---------------------------------------------
+# Connect to database
+#---------------------------------------------
+sub ConnectToDatabases ()
+{
+ if (!$useSock)
+ {
+ $dbhM = DBI->connect("dbi:mysql:database=mysql;host=$host;port=$port",
+ "$user", "$pass",{RaiseError => 0,PrintError =>0})
+ or FailedSQL("Can't connect to MySQLD process on $host using $port");
+ }
+ else
+ {
+ $dbhM = DBI->connect("DBI:mysql:database=mysql;host=$host", "$user", "$pass",
+ {RaiseError => 0,PrintError =>0})
+ or FailedSQL("Can't connect to MySQLD process on $host using socket");
+ }
+ LogMessage("INSERT/DELETE -> Connected to MySQLD on $host");
+}
+
+#-----------------------------------------------
+# Disconnect from database
+#-----------------------------------------------
+sub DisconnectFromDatabase ()
+{
+ DropDB();
+ $dbhM->disconnect
+ or FailedSQL("Disconnect failed: $DBI::errstr");
+ LogMessage("INSERT/DELETE -> Disconnected from MySQLD on $host");
+}
+
+#-------------------------------------------------
+# Create/Drop database
+#-------------------------------------------------
+sub DropDB()
+{
+ $sth = $dbhM->prepare("DROP DATABASE IF EXISTS $database;")
+ or FailedSQL("Prepare DROP DB $database error: ");
+ $sth->execute();#/Don't care if returns success. No "die" needed
+ $sth->finish();
+ if ($diskDataC)
+ {
+ DropDiskD();
+ }
+}
+sub CreateDB ()
+{
+ LogMessage("INSERT/DELETE -> Creating database $database!");
+ DropDB();
+ $sth = $dbhM->prepare("CREATE DATABASE $database;")
+ or FailedSQL("Prepare Create DB $database error: ");
+ $sth->execute()
+ or FailedSQL("Create DB $database Error: ");
+ $sth->finish();
+
+ $sth = $dbhM->prepare("USE $database;")
+ or FailedSQL("Prepare USE $database error: ");
+ $sth->execute()
+ or FailedSQL("USE DB $database Error: ");
+ $sth->finish();
+
+ if($diskData && !$skipLFG)
+ {
+ LogMessage("INSERT/DELETE -> Creating LFG $lfgName....");
+ $sth = $dbhM->prepare("CREATE LOGFILE GROUP $lfgName
+ ADD UNDOFILE 'undofile.dat'
+ INITIAL_SIZE $undoSize
+ UNDO_BUFFER_SIZE = $undoBuffer
+ ENGINE=NDB;")
+ or FailedSQL("Prepare CREATE LOGFILE GROUP error: ");
+ $sth->execute()
+ or FailedSQL("CREATE LOGFILE GROUP error: ");
+ $sth->finish();
+
+ if($numUndo > 1)
+ {
+ $undoCount = $numUndo - 1;
+ LogMessage("INSERT/DELETE -> Adding additional undo files, please stand by....");
+ while ( $undoCount > 0)
+ {
+ $file="undofile".$undoCount.".dat";
+ LogMessage("INSERT/DELETE -> Adding undo file $file..");
+ $sth = $dbhM->prepare("ALTER LOGFILE GROUP $lfgName
+ ADD UNDOFILE '$file'
+ INITIAL_SIZE $undoSize
+ ENGINE=NDB;")
+ or FailedSQL("Prepare ALTER LOGFILE GROUP error: ");
+ $sth->execute()
+ or FailedSQL("ALTER LOGFILE GROUP error: ");
+ $sth->finish();
+ $undoCount--;
+ }
+ }
+ }
+ if($diskData)
+ {
+ LogMessage("INSERT/DELETE -> Creating TS $tsName....");
+ $sth = $dbhM->prepare("CREATE TABLESPACE $tsName
+ ADD DATAFILE 'datafile.dat'
+ USE LOGFILE GROUP $lfgName
+ INITIAL_SIZE $ddSize
+ ENGINE=NDB;")
+ or FailedSQL("Prepare CREATE TABLESPACE error: ");
+ $sth->execute()
+ or FailedSQL("CREATE TABLESPACE error: ");
+ $sth->finish();
+
+ if($numData > 1)
+ {
+ $dataCount = $numData - 1;
+ while ($dataCount > 0)
+ {
+ $file="datafile".$dataCount.".dat";
+ LogMessage("INSERT/DELETE -> Add data file $file");
+ $sth = $dbhM->prepare("ALTER TABLESPACE $tsName
+ ADD DATAFILE '$file'
+ INITIAL_SIZE $ddSize
+ ENGINE=NDB;")
+ or FailedSQL("Prepare ALTER TABLE SPACE error: ");
+ $sth->execute()
+ or FailedSQL("ALTER TABLE SPACE error: ");
+ $sth->finish();
+ $dataCount--;
+ }
+ }
+ $diskDataC=1;
+ }
+ LogMessage("INSERT/DELETE -> $database created.");
+}
+
+#------------------
+# Create tables
+#------------------
+sub CreateTables ()
+{
+ if(!$diskData)
+ {
+ LogMessage("INSERT/DLETE -> Creating Simple Table");
+ my $loopCounter = 0;
+ $failed = 1;
+ while ($loopCounter < 4 && $failed == 1)
+ {
+ $failed = 0;
+ $loopCounter++;
+ $sth = $dbhM->prepare("CREATE TABLE simple (aid INT, bid INT,
+ balance DECIMAL(8,2),
+ filler CHAR(80),
+ PRIMARY KEY (aid))
+ ENGINE=$engineType;")
+ or FailedSQL("Prepare Create simple table Error:");
+ $sth->execute()
+ or SQL_ExecuteError("Create simple table Error:",1);
+ $sth->finish();
+ }
+ if($loopCounter == 4){FailedExit("Create Simple Table Error:");}
+
+ }
+ else
+ {
+ LogMessage("INSERT/DELETE -> Creating simple Table DD");
+ $failed = 0;
+ $sth = $dbhM->prepare("CREATE TABLE simple (aid INT, bid INT,
+ balance DECIMAL(8,2),
+ filler CHAR(80),
+ PRIMARY KEY (aid))
+ TABLESPACE $tsName
+ STORAGE DISK ENGINE=$engineType;")
+ or FailedSQL("Prepare Create simple table DD Error: ");
+ $sth->execute()
+ or SQL_ExecuteError("Create simple DD Table Error: ",1);
+ $sth->finish();
+ if($failed == 1){FailedExit("Create simple DD Table Error:");}
+ }
+ if(!$diskData)
+ {
+ $loopCounter = 0;
+ $failed = 1;
+ while ($loopCounter < 4 && $failed == 1)
+ {
+ $failed = 0;
+ $loopCounter++;
+ $sth = $dbhM->prepare("CREATE TABLE long_blob (aid INT, bid INT,
+ balance DECIMAL(8,2),
+ filler LONGBLOB,
+ PRIMARY KEY (aid))
+ ENGINE=$engineType;")
+ or FailedSQL("Prepare Create long_blob table Error:");
+ $sth->execute()
+ or SQL_ExecuteError("Create long_blob table Error:",1);
+ $sth->finish();
+ }
+ if($loopCounter == 4){FailedExit("Create long_blob Table Error:");}
+ }
+ else
+ {
+ LogMessage("INSERT/DELETE -> Creating long_blob DD Table");
+ $failed = 0;
+ $sth = $dbhM->prepare("CREATE TABLE long_blob (aid INT, bid INT,
+ balance DECIMAL(8,2),
+ filler LONGBLOB,
+ PRIMARY KEY (aid))
+ TABLESPACE $tsName
+ STORAGE DISK ENGINE=$engineType;")
+ or FailedSQL("Prepare Create long_blob table DD Error: ");
+ $sth->execute()
+ or SQL_ExecuteError("Create DD long_blob Table DD Error: ",1);
+ $sth->finish();
+ if($failed == 1){FailedExit("Create long_blob Table DD Error:");}
+ }
+ LogMessage("INSERT/DELETE -> Tables Created!");
+}
+
+#-------------------------------------------------
+# Drop Table Space section
+#-------------------------------------------------
+sub DropDiskD ()
+{
+ my $dfCount=0;
+ if ($numData > 1)
+ {
+ $dfCount = $numData - 1;
+ while ($dfCount > 0)
+ {
+ $file="datafile".$dfCount.".dat";
+ LogMessage("INSERT/DELETE -> Removing TS $file..");
+ $sth = $dbhM->prepare("ALTER TABLESPACE $tsName
+ DROP DATAFILE '$file'
+ ENGINE = NDB;")
+ or FailedSQL("Prepare drop data file loop error: ");
+ $sth->execute()
+ or SQL_ExecuteError("Drop Data file Error: ",1);
+ $sth->finish();
+ $dfCount--;
+ }
+ }
+
+ LogMessage("INSERT/DELETE -> Removing TS datafile.dat");
+ $sth = $dbhM->prepare("ALTER TABLESPACE $tsName
+ DROP DATAFILE 'datafile.dat'
+ ENGINE = NDB;")
+ or FailedSQL("Prepare drop data file error: ");
+ $sth->execute()
+ or SQL_ExecuteError("Drop Data file Error: ",1);
+ $sth->finish();
+ LogMessage("INSERT/DELETE -> TS Data File(s) Dropped.........");
+
+ $sth = $dbhM->prepare("DROP TABLESPACE $tsName ENGINE = NDB;")
+ or FailedSQL("Prepare drop table space error: ");
+ $sth->execute()
+ or SQL_ExecuteError("Drop table space Error: ",1);
+ $sth->finish();
+ LogMessage("INSERT/DELETE -> Tables Space $tsName Dropped!!");
+
+ $sth = $dbhM->prepare("DROP LOGFILE GROUP $lfgName ENGINE=NDB;")
+ or FailedSQL("Prepare drop LFG error: ");
+ $sth->execute()
+ or SQL_ExecuteError("Drop LFG Error: ",1);
+ $sth->finish();
+ LogMessage("INSERT/DELETE -> Log File Group $lfgName dropped!!!");
+
+ return;
+}
+
+
+#-----------------------------------------------
+# Load tables
+#-----------------------------------------------
+
+# Simple
+
+sub LoadTableSimple ()
+{
+ LogMessage("INSERT/DELETE -> Loading simple table");
+ $sth = $dbhM->prepare("INSERT INTO $database.simple VALUES(?, ?, ?, ?);")
+ or FailedSQL("Prepare insert into simple error: ");
+ local $i=0;
+ local $count=0;
+ local $startTime = time;
+ while($i < $rows)
+ {
+ $count++;
+ $i++;
+ $sth->bind_param(1, $i);
+ $sth->bind_param(2, $i);
+ $sth->bind_param(3, $balance);
+ $sth->bind_param(4, "Going fishing");
+ $sth->execute()
+ or FailedSQL("insert into simple Error: ");
+ if($count == 10000)
+ {
+ $count=0;
+ LogMessage("INSERT/DELETE -> 10,000 rows inserted");
+ }
+ }
+ $sth->finish();
+ local $finishTime = (time - $startTime);
+ LogCsv("LOAD-SIMPLE,$finishTime");
+ LogReport("-------------------------------------------------------");
+ LogReport("INSERT/DLETE -> Loading simple took $finishTime seconds for $rows rows");
+ LogMessage("INSERT/DELETE -> Loading simple table is complete");
+}
+
+# blob
+
+sub LoadTableBlob ()
+{
+ LogMessage("INSERT/DELETE -> Loading long_blob table");
+ $sth = $dbhM->prepare("INSERT INTO $database.long_blob VALUES(?, ?, ?, ?);")
+ or FailedSQL("Prepare insert into long_blob error: ");
+ local $i=0;
+ GetBlob();
+ local $startTime = time;
+ local $count=0;
+ while($i < $rows)
+ {
+ $count++;
+ $i++;
+ $sth->bind_param(1, $i);
+ $sth->bind_param(2, $i);
+ $sth->bind_param(3, $balance);
+ $sth->bind_param(4, $blob);
+ $sth->execute()
+ or FailedSQL("insert into long_blob Error: ");
+ if($count == 10000)
+ {
+ $count=0;
+ LogMessage("INSERT/DELETE -> 10,000 rows inserted");
+ }
+ }
+ $sth->finish();
+ local $finishTime = (time - $startTime);
+ LogCsv("LOAD-BLOB,$finishTime");
+ LogReport("-------------------------------------------------------");
+ LogReport("INSERT/DLETE -> Loading long_blob took $finishTime seconds for $rows rows");
+ LogMessage("INSERT/DELETE -> Loading long_blob table is complete");
+}
+
+#---------------
+# Delete Data
+#---------------
+
+# Simple
+
+sub DeleteFromTableSimple ()
+{
+ local $i=0;
+ LogMessage("INSERT/DELETE -> delete from simple table");
+ $sth = $dbhM->prepare("DELETE FROM $database.simple WHERE aid = ?;")
+ or FailedSQL("Prepare delete from simple error: ");
+ local $startTime = time;
+ while($i < ($rows - 2))
+ {
+ $i++;
+ $sth->bind_param(1, $i);
+ $sth->execute()
+ or FailedSQL("delete from simple error");
+ }
+ $sth->finish();
+ local $finishTime = (time - $startTime);
+ LogCsv("DELETE-SIMPLE,$finishTime");
+ LogReport("--------------------------------------------------------------");
+ LogReport("INSTER/DELETE -> Deleting from simple took $finishTime seconds for $rows rows");
+ LogMessage("INSERT/DELETE -> Delete from simple table complete");
+}
+
+# Blob
+
+sub DeleteFromTableBlob ()
+{
+ local $i=0;
+ LogMessage("INSERT/DELETE -> delete from long_blob table");
+ $sth = $dbhM->prepare("DELETE FROM $database.long_blob WHERE aid = ?;")
+ or FailedSQL("Prepare delete from long_blob error: ");
+ local $startTime = time;
+ while($i < ($rows - 2))
+ {
+ $i++;
+ $sth->bind_param(1, $i);
+ $sth->execute()
+ or FailedSQL("delete from long_blob error");
+ }
+ $sth->finish();
+ local $finishTime = (time - $startTime);
+ LogCsv("DELETE-BLOB,$finishTime");
+ LogReport("--------------------------------------------------------------");
+ LogReport("INSTER/DELETE -> Deleting from long_blob took $finishTime seconds for $rows rows");
+ LogMessage("INSERT/DELETE -> Delete from long_blob table complete");
+}
+
+#---------------
+# Del/insert
+#---------------
+
+# Simple
+
+sub DeleteInsertSimple()
+{
+ LogMessage("INSERT/DELETE -> delete/insert to simple table starting");
+ local $delSth = $dbhM->prepare("DELETE FROM $database.simple WHERE aid = ?;")
+ or FailedSQL("INSERT/DELETE -> Prepare delete from simple error: ");
+ $sth = $dbhM->prepare("INSERT INTO $database.simple VALUES(?, ?, ?, ?);")
+ or FailedSQL("INSERT/DELETE -> Prepare insert into simple error: ");
+ local $i = 0;
+ local $startTime = time;
+ while( $i < $delInst)
+ {
+ $i++;
+ $aid = int(rand($rows));
+ $delSth->bind_param(1, $aid);
+ $delSth->execute()
+ or FailedSQL("INSERT/DELETE -> delete from simple error");
+ $sth->bind_param(1, $aid);
+ $sth->bind_param(2, $aid);
+ $sth->bind_param(3, $balance);
+ $sth->bind_param(4, "Going fishing");
+ $sth->execute()
+ or FailedSQL("INSERT/DELETE -> insert into simple Error: ");
+ }
+ $delSth->finish();
+ $sth->finish();
+ local $finishTime = (time - $startTime);
+ LogCsv("DEL-INS-ROWS-SIMPLE,$finishTime");
+ LogReport("---------------------------------------------");
+ LogReport("INSERT/DELETE -> Simple took $finishTime seconds for D/I $delInst rows");
+ LogMessage("INSERT/DELETE -> delete/insert to simple table complete");
+}
+
+# blob
+
+sub DeleteInsertBlob()
+{
+ LogMessage("INSERT/DELETE -> delete/insert to long_blob table starting");
+ local $delSth = $dbhM->prepare("DELETE FROM $database.long_blob WHERE aid = ?;")
+ or FailedSQL("INSERT/DELETE -> Prepare delete from long_blob error: ");
+ $sth = $dbhM->prepare("INSERT INTO $database.long_blob VALUES(?, ?, ?, ?);")
+ or FailedSQL("INSERT/DELETE -> Prepare insert into long_blob error: ");
+ local $i = 0;
+ GetBlob();
+ local $startTime = time;
+ while( $i < $delInst)
+ {
+ $i++;
+ $aid = int(rand($rows));
+ $delSth->bind_param(1, $aid);
+ $delSth->execute()
+ or FailedSQL("INSERT/DELETE -> delete from long_blob error");
+ $sth->bind_param(1, $aid);
+ $sth->bind_param(2, $aid);
+ $sth->bind_param(3, $balance);
+ $sth->bind_param(4, $blob);
+ $sth->execute()
+ or FailedSQL("INSERT/DELETE -> insert into long_blob Error: ");
+ }
+ $delSth->finish();
+ $sth->finish();
+ local $finishTime = (time - $startTime);
+ LogCsv("DEL-INS-ROWS-BLOB,$finishTime");
+ LogReport("---------------------------------------------");
+ LogReport("INSERT/DELETE -> long_blob took $finishTime seconds for D/I $delInst rows");
+ LogMessage("INSERT/DELETE -> delete/insert to long_blob table complete");
+}
+
+#----------------
+# Error Handlers
+#----------------
+
+sub FailedSQL ($)
+{
+ $msg = shift;
+ LogMessage("INSERT/DELETE -> $msg");
+ $msg = $DBI::err;
+ LogMessage("Err#: $msg");
+ $msg = $DBI::errstr;
+ LogMessage("Err-> $msg");
+ DropDB();
+ print 1;
+ exit 1;
+}
+
+sub SQL_ExecuteError($$)
+{
+ $msg = shift;
+ $show = shift;
+ LogMessage("$msg");
+ my $showResults=$sth->err;
+ my $showResults2=$sth->errstr;
+ LogMessage("Err#: $showResults");
+ LogMessage("Err-> $showResults2");
+ if($show){
+ my $showResults3='';
+ my $ShowNDB_sth = $dbhM->prepare("SHOW ENGINE NDB STATUS;")
+ or FailedSQL("Prepare SHOW ENGINE NDB STATUS: ");
+ $ShowNDB_sth->execute();
+ $ShowNDB_sth->bind_col (1, \$showResults);
+ $ShowNDB_sth->bind_col (2, \$showResults2);
+ $ShowNDB_sth->bind_col (3, \$showResults3);
+ LogMessage("**** SHOW ENGINE STATUS ****");
+ while($ShowNDB_sth->fetch()){
+ LogMessage("------------------------------------");
+ LogMessage("$showResults");
+ LogMessage("$showResults2");
+ LogMessage("$showResults3");
+ }
+ }
+ sleep 10;
+ $failed = 1;
+}
+
+sub FailedExit ($)
+{
+ $msg = shift;
+ LogMessage("INSERT/DELETE -> $msg");
+ DropDB();
+ print 1;
+ exit 1;
+}
+
+#-------------------
+# Read BLOB
+#-------------------
+
+sub GetBlob ()
+{
+ LogMessage("INSERT/DELETE -> Getting Blob from $blobFile");
+ local $fh;
+ OpenFileRead(*fh,$blobFile);
+ read($fh, $blob, -s $fh);
+ CloseFile(*fh);
+ LogMessage("INSERT/DELETE -> Got Blob from $blobFile");
+ return;
+}
+#---------------------------------------------
+# File OPS
+#---------------------------------------------
+sub OpenFileRead ($$)
+{
+ local *handle = $_[0];
+ local $file = $_[1];
+ $handle = IO::File->new("$file", O_RDONLY)
+ or FailedExit("ERROR: could not open for read $file: $!");
+}
+
+sub OpenFileAppend ($$)
+{
+ local *handle = $_[0];
+ local $file = $_[1];
+ if (-e $file)
+ {
+ $handle = IO::File->new("$file", O_WRONLY|O_APPEND)
+ or FailedExit("ERROR: could not append $file: $!");
+ }
+ else
+ {
+ OpenFileForWrite(*handle, $file);
+ }
+}
+
+sub OpenFileForWrite ($$)
+{
+ local *handle = $_[0];
+ local $file = $_[1];
+ $handle = IO::File->new("$file", O_WRONLY|O_TRUNC|O_CREAT)
+ or FailedExit("ERROR: could not open for write $file: $!");
+}
+
+sub CloseFile ($)
+{
+ local *handle = $_[0];
+ $handle->close;
+}
+
+#--------------------------
+# Logging
+#--------------------------
+sub LogMessage($)
+{
+ if (defined $logFile)
+ {
+ local $fh;
+ OpenFileAppend (*fh,$logFile);
+ print $fh "$_[0]\n";
+ CloseFile (*fh);
+ }
+ return;
+}
+
+sub LogCsv($)
+{
+ if (defined $csvFile)
+ {
+ local $fh;
+ OpenFileAppend (*fh,$csvFile);
+ print $fh "$_[0]\n";
+ CloseFile (*fh);
+ }
+ return;
+}
+
+sub LogReport($)
+{
+ if (defined $rptFile)
+ {
+ local $fh;
+ OpenFileAppend (*fh,$rptFile);
+ if(!$date)
+ {
+ my $now = localtime;
+ print $fh "INSERT/DELETE Test Date: $now\n";
+ $date=1
+ }
+ print $fh "$_[0]\n";
+ CloseFile (*fh);
+ }
+ return;
+}
+
+################### End of script #############
=== added file 'tests/insert_delete/logo-mysql.jpg'
Binary files a/tests/insert_delete/logo-mysql.jpg 1970-01-01 00:00:00 +0000 and b/tests/insert_delete/logo-mysql.jpg 2009-02-13 21:08:34 +0000 differ
=== added file 'tests/insert_delete/loop.sh'
--- a/tests/insert_delete/loop.sh 1970-01-01 00:00:00 +0000
+++ b/tests/insert_delete/loop.sh 2009-02-13 21:08:34 +0000
@@ -0,0 +1,4 @@
+while true
+ do
+ perl load_and_delete.pl --port=15002 --host=ndb18 --log=/space/cluster_rep_auto/logs/tpcb.log
+done
=== modified file 'tests/joinAtomics/src/Join.cpp'
--- a/tests/joinAtomics/src/Join.cpp 2008-08-07 17:35:52 +0000
+++ b/tests/joinAtomics/src/Join.cpp 2009-02-13 21:08:34 +0000
@@ -256,6 +256,8 @@ void Join::SetSeed(){
mov dword ptr [rand_seed.timerlo],eax
popa
}
+ #elif defined(sparc)
+ rand_seed.timerlo = 4711;
#elif defined(COMPILER_GCC)
// GCC syntax for getting timer rdtsc into edx:eax
asm __volatile__
=== modified file 'tests/joinAtomics/src/JoinsTest'
Binary files a/tests/joinAtomics/src/JoinsTest 2008-12-17 15:05:57 +0000 and b/tests/joinAtomics/src/JoinsTest 2009-02-13 21:08:34 +0000 differ
=== modified file 'tests/ndbatomics/load_atomics.pl'
--- a/tests/ndbatomics/load_atomics.pl 2008-12-17 15:05:57 +0000
+++ b/tests/ndbatomics/load_atomics.pl 2009-02-13 21:08:34 +0000
@@ -30,11 +30,11 @@ use IO::File;
#-----------------------------------------------
# Globals Vars
#-----------------------------------------------
-our $our_host='localhost';
-our $our_port='3306';
-our $our_user='root';
-our $our_pass='';
-our $our_database='ndbatomics';
+our $host='localhost';
+our $port='3306';
+our $user='root';
+our $pass='';
+our $database='ndbatomics';
our $dbhM='';
our $aid=0;
our $bid=0;
@@ -44,18 +44,21 @@ our $accounts=1000000; #/should be chang
our $branches=100000; #/should be changed for bigger databases
our $c_only=0;
our $sp_only=0;
-our $our_engine_type='NDB';
-our $our_lfg_name='lg1';
-our $our_ts_name='ts1';
-our $our_diskData=0;
-our $our_mixData=0;
-our $our_num_undo=1;
-our $our_skipLFG=0;
-our $our_num_data=40;
-our $our_cfiles=0;
-our $our_loadFromFiles=0;
-our $our_sockPath='/tmp/mysql.sock';
-our $our_useSock=0;
+our $engine_type='NDB';
+our $lfg_name='lg1';
+our $ts_name='ts1';
+our $diskData=0;
+our $mixData=0;
+our $num_undo=1;
+our $skipLFG=0;
+our $num_data=40;
+our $logInitialSize='2000M';
+our $logUndoBufferSize='4M';
+our $tsInitialSize='100M';
+our $cfiles=0;
+our $loadFromFiles=0;
+our $sockPath='/tmp/mysql.sock';
+our $useSock=0;
our $DEBUG=0;
#-------------------------------------------------
# Sub Pototypes
@@ -146,38 +149,38 @@ sub ShowVars ()
print "*********************************************\n";
print "************ Command-line values ************\n";
print "*********************************************\n";
- print "Host ..................... $our_host\n";
- print "User ..................... $our_user\n";
- print "Password ................. $our_pass\n" if ($our_pass ne '');
- print "Password ................. BLANK\n" if ($our_pass eq '');
- print "Port ..................... $our_port\n";
- print "Use Socket To Connect .... TRUE\n" if ($our_useSock);
- print "Use Socket To Connect .... FALSE\n" if (!$our_useSock);
- print "Socket Path .............. $our_sockPath\n" if ($our_useSock);
- print "Database ................. $our_database\n";
- print "Engine Type .............. $our_engine_type\n";
+ print "Host ..................... $host\n";
+ print "User ..................... $user\n";
+ print "Password ................. $pass\n" if ($pass ne '');
+ print "Password ................. BLANK\n" if ($pass eq '');
+ print "Port ..................... $port\n";
+ print "Use Socket To Connect .... TRUE\n" if ($useSock);
+ print "Use Socket To Connect .... FALSE\n" if (!$useSock);
+ print "Socket Path .............. $sockPath\n" if ($useSock);
+ print "Database ................. $database\n";
+ print "Engine Type .............. $engine_type\n";
print "Program Load Data ........ TRUE\n" if(!$c_only &&
- !$our_loadFromFiles);
+ !$loadFromFiles);
print "Number of rows Account.... $accounts\n" if(!$c_only);
print "Number of rows Branches... $branches\n" if(!$c_only);
$teller=$branches*2;
print "Number of rows Teller .... $teller\n" if(!$c_only);
print "Use Disk Data ............ TRUE\n" if ($diskData || $mixData);
print "Use Disk Data ............ FALSE\n" if (!$diskData && !$mixData);
- print "LFG Name ................. $our_lfg_name\n" if ($diskData ||
- $mixData);
+ print "LFG Name ................. $lfg_name\n" if ($diskData ||
+ $mixData);
print "Create Log File Group .... TRUE\n" if ($diskData ||
$mixData &&
- !$our_skipLFG);
+ !$skipLFG);
print "Create Log File Group .... FALSE\n" if ($diskData ||
$mixData &&
- $our_skipLFG);
- print "Number LFG Undo File(s)... $our_num_undo\n" if ($diskData ||
- $mixData);
- print "Table Space Name ......... $our_ts_name\n" if ($diskData ||
- $mixData);
- print "Number TS Data Files(s)... $our_num_data\n" if ($diskData ||
- $mixData);
+ $skipLFG);
+ print "Number LFG Undo File(s)... $num_undo\n" if ($diskData ||
+ $mixData);
+ print "Table Space Name ......... $ts_name\n" if ($diskData ||
+ $mixData);
+ print "Number TS Data Files(s)... $num_data\n" if ($diskData ||
+ $mixData);
}
#--------------------------------
@@ -187,20 +190,22 @@ sub CollectCommandPromptInfo ()
{
if (!GetOptions("help"=>\$help,
- "host:s"=>\$our_host,
- "user:s"=>\$our_user,
- "port:i"=>\$our_port,
- "socket"=>\$our_useSock,
- "spath:s"=>\$our_sockPath,
- "pass:s"=>\$our_pass,
- "engine:s"=>\$our_engine_type,
- "database:s"=>\$our_database,
- "lfgname:s"=>\$our_lfg_name,
- "numLFGUndo:i"=>\$our_num_undo,
- "skipLFGcreate"=>\$our_skipLFG,
- "tsName:s"=>\$our_ts_name,
- "numTSData:i"=>\$our_num_data,
- "numAcc:i"=>\$accounts))
+ "host:s"=>\$host,
+ "user:s"=>\$user,
+ "port:i"=>\$port,
+ "socket"=>\$useSock,
+ "spath:s"=>\$sockPath,
+ "pass:s"=>\$pass,
+ "engine:s"=>\$engine_type,
+ "database:s"=>\$database,
+ "lfgname:s"=>\$lfg_name,
+ "numLFGUndo:i"=>\$num_undo,
+ "skipLFGcreate"=>\$skipLFG,
+ "tsName:s"=>\$ts_name,
+ "numTSData:i"=>\$num_data,
+ "numAcc:i"=>\$accounts,
+ "lfgFileSize:s"=>\$logInitialSize,
+ "tsFileSize:s"=>\$tsInitialSize))
{
Usage();
}
@@ -209,20 +214,20 @@ sub CollectCommandPromptInfo ()
$branches=$accounts/10;
- if ($our_useSock){
- $ENV{MYSQL_UNIX_PORT} = $our_sockPath;
+ if ($useSock){
+ $ENV{MYSQL_UNIX_PORT} = $sockPath;
}
- if ($our_engine_type ne 'ndb' && $our_engine_type ne 'ndbcluster'
- && $our_engine_type ne 'NDBDD' && $our_engine_type ne 'NDBMIX'
- && $our_engine_type ne 'ndbdd' && $our_engine_type ne 'ndbmix'
- && $our_engine_type ne 'NDB' && $our_engine_type ne 'NDBCLUSTER'){
+ if ($engine_type ne 'ndb' && $engine_type ne 'ndbcluster'
+ && $engine_type ne 'NDBDD' && $engine_type ne 'NDBMIX'
+ && $engine_type ne 'ndbdd' && $engine_type ne 'ndbmix'
+ && $engine_type ne 'NDB' && $engine_type ne 'NDBCLUSTER'){
die Usage();
}
- if ($our_engine_type eq 'ndbdd'){$our_engine_type = "ndb"; $diskData = 1;}
- if ($our_engine_type eq 'ndbmix'){$our_engine_type = "ndb"; $mixData = 1;}
- if ($our_engine_type eq 'NDBDD'){$our_engine_type = "ndb"; $diskData = 1;}
- if ($our_engine_type eq 'NDBMIX'){$our_engine_type = "ndb"; $mixData = 1;}
+ if ($engine_type eq 'ndbdd'){$engine_type = "ndb"; $diskData = 1;}
+ if ($engine_type eq 'ndbmix'){$engine_type = "ndb"; $mixData = 1;}
+ if ($engine_type eq 'NDBDD'){$engine_type = "ndb"; $diskData = 1;}
+ if ($engine_type eq 'NDBMIX'){$engine_type = "ndb"; $mixData = 1;}
if($DEBUG) {ShowVars();}
}
@@ -232,14 +237,14 @@ sub CollectCommandPromptInfo ()
#---------------------------------------------
sub ConnectToDatabases ()
{
- if (!$our_useSock){
- $dbhM = DBI->connect("dbi:mysql:database=mysql;host=$our_host;port=$our_port",
- "$our_user", "$our_pass")
+ if (!$useSock){
+ $dbhM = DBI->connect("dbi:mysql:database=mysql;host=$host;port=$port",
+ "$user", "$pass")
or die "Can't connect to MySQL process! Error: $DBI::errstr\n";
}
else{
- $dbhM = DBI->connect("DBI:mysql:database=mysql;host=$our_host",
- "$our_user", "$our_pass", {'RaiseError' => 1})
+ $dbhM = DBI->connect("DBI:mysql:database=mysql;host=$host",
+ "$user", "$pass", {'RaiseError' => 1})
or die "Can't connect to MySQL process! Error: $DBI::errstr\n";
}
if ($DEBUG){print " Connected to MySQLD.\n";}
@@ -262,44 +267,44 @@ sub CreateDB ()
{
if($DEBUG){print "Creating database!\n";}
- $sth = $dbhM->prepare("DROP DATABASE IF EXISTS $our_database;")
+ $sth = $dbhM->prepare("DROP DATABASE IF EXISTS $database;")
or die "Prepare error: ", $dbhM->errstr;
$sth->execute();#/Don't care if returns success. No "die" needed
$sth->finish();
- $sth = $dbhM->prepare("CREATE DATABASE $our_database;")
+ $sth = $dbhM->prepare("CREATE DATABASE $database;")
or die "Prepare error: ", $dbhM->errstr;
$sth->execute()
or die "Create DB Error: ", $sth->errstr;
$sth->finish();
- $sth = $dbhM->prepare("USE $our_database;")
+ $sth = $dbhM->prepare("USE $database;")
or die "Prepare error: ", $dbhM->errstr;
$sth->execute()
or die "USE DB Error: ", $sth->errstr;
$sth->finish();
- if($diskData || $mixData && !$our_skipLFG){
- if($DEBUG){print "Creating LFG $our_lfg_name....\n";}
- $sth = $dbhM->prepare("CREATE LOGFILE GROUP $our_lfg_name
+ if($diskData || $mixData && !$skipLFG){
+ if($DEBUG){print "Creating LFG $lfg_name....\n";}
+ $sth = $dbhM->prepare("CREATE LOGFILE GROUP $lfg_name
ADD UNDOFILE 'undofile.dat'
- INITIAL_SIZE 2000M
- UNDO_BUFFER_SIZE = 4M
+ INITIAL_SIZE $logInitialSize
+ UNDO_BUFFER_SIZE = $logUndoBufferSize
ENGINE=NDB;")
or die "Prepare CREATE LOGFILE GROUP error: ", $dbhM->errstr;
$sth->execute()
or die "CREATE LOGFILE GROUP error: ", $sth->errstr;
$sth->finish();
- if($our_num_undo > 1){
- $undo_count = $our_num_undo - 1;
+ if($num_undo > 1){
+ $undo_count = $num_undo - 1;
if($DEBUG){print "Adding additional undo files, please stand by....\n";}
while ( $undo_count > 0){
$file="undofile".$undo_count.".dat";
if($DEBUG){print "Adding $file..\n";}
- $sth = $dbhM->prepare("ALTER LOGFILE GROUP $our_lfg_name
+ $sth = $dbhM->prepare("ALTER LOGFILE GROUP $lfg_name
ADD UNDOFILE '$file'
- INITIAL_SIZE 2500M
+ INITIAL_SIZE $logInitialSize
ENGINE=NDB;")
or die "Prepare ALTER LOGFILE GROUP error: ", $dbhM->errstr;
$sth->execute()
@@ -311,25 +316,25 @@ sub CreateDB ()
}
if($diskData || $mixData){
- if($DEBUG){print "Creating TS $our_ts_name....\n";}
- $sth = $dbhM->prepare("CREATE TABLESPACE $our_ts_name
+ if($DEBUG){print "Creating TS $ts_name....\n";}
+ $sth = $dbhM->prepare("CREATE TABLESPACE $ts_name
ADD DATAFILE 'datafile.dat'
- USE LOGFILE GROUP $our_lfg_name
- INITIAL_SIZE 50M
+ USE LOGFILE GROUP $lfg_name
+ INITIAL_SIZE $tsInitialSize
ENGINE=NDB;")
or die "Prepare CREATE TABLESPACE error: ", $dbhM->errstr;
$sth->execute()
or die "CREATE TABLESPACE error: ", $sth->errstr;
$sth->finish();
- if($our_num_data > 1){
- $data_count = $our_num_data - 1;
+ if($num_data > 1){
+ $data_count = $num_data - 1;
while ($data_count > 0){
$file="datafile".$data_count.".dat";
if($DEBUG){print "Add data file $file\n";}
- $sth = $dbhM->prepare("ALTER TABLESPACE $our_ts_name
+ $sth = $dbhM->prepare("ALTER TABLESPACE $ts_name
ADD DATAFILE '$file'
- INITIAL_SIZE 50M
+ INITIAL_SIZE $tsInitialSize
ENGINE=NDB;")
or die "Prepare ALTER TABLE SPACE error: ", $dbhM->errstr;
$sth->execute()
@@ -364,7 +369,7 @@ sub Create_Tables ()
balance DOUBLE,
filler CHAR(80),
PRIMARY KEY (aid))
- ENGINE=$our_engine_type;")
+ ENGINE=$engine_type;")
or die "Prepare Create Account Error: ", $dbhM->errstr;
$sth->execute()
or die "Create Account Table Error: ", $sth->errstr;
@@ -377,8 +382,8 @@ sub Create_Tables ()
balance DOUBLE,
filler CHAR(80),
PRIMARY KEY (aid))
- TABLESPACE $our_ts_name
- STORAGE DISK ENGINE=$our_engine_type;")
+ TABLESPACE $ts_name
+ STORAGE DISK ENGINE=$engine_type;")
or die "Prepare Create Account DD Error: ", $dbhM->errstr;
$sth->execute()
or die "Create DD Account Table Error: ", $sth->errstr;
@@ -395,7 +400,7 @@ sub Create_Tables ()
TransTime DATETIME,
scriptId CHAR(10),
filler CHAR(80),
- PRIMARY KEY (id))ENGINE=$our_engine_type;")
+ PRIMARY KEY (id))ENGINE=$engine_type;")
or die "Prepare Create History Error: ", $dbhM->errstr;
$sth->execute()
or die "Create History Table Error: ", $sth->errstr;
@@ -410,8 +415,8 @@ sub Create_Tables ()
scriptId CHAR(10),
filler CHAR(80),
PRIMARY KEY (id))
- TABLESPACE $our_ts_name
- STORAGE DISK ENGINE=$our_engine_type;")
+ TABLESPACE $ts_name
+ STORAGE DISK ENGINE=$engine_type;")
or die "Prepare Create History DD Error: ", $dbhM->errstr;
$sth->execute()
or die "Create History DD Table Error: ", $sth->errstr;
=== modified file 'tests/ndbatomics/src/Atomics.cpp'
--- a/tests/ndbatomics/src/Atomics.cpp 2008-12-17 15:05:57 +0000
+++ b/tests/ndbatomics/src/Atomics.cpp 2009-02-13 21:08:34 +0000
@@ -662,6 +662,8 @@ void Atomics::SetSeed(){
mov dword ptr [rand_seed.timerlo],eax
popa
}
+ #elif defined(sparc)
+ rand_seed.timerlo = 4711;
#elif defined(COMPILER_GCC)
// GCC syntax for getting timer rdtsc into edx:eax
asm __volatile__
=== added file 'tests/ndbatomics/src/NDBAtomics'
Binary files a/tests/ndbatomics/src/NDBAtomics 1970-01-01 00:00:00 +0000 and b/tests/ndbatomics/src/NDBAtomics 2009-02-13 21:08:34 +0000 differ
=== removed directory 'tests/tpcb/extras'
=== removed file 'tests/tpcb/extras/load_and_delete.pl'
--- a/tests/tpcb/extras/load_and_delete.pl 2008-12-17 15:05:57 +0000
+++ b/tests/tpcb/extras/load_and_delete.pl 1970-01-01 00:00:00 +0000
@@ -1,508 +0,0 @@
-#---------------------------------------------------------------------
-#/* Copyright (C) 2000-2006 MySQL AB
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-# Version 1.1
-#------------------------------------------------------------------------
-# Purpose: This application creates and loads the database, tables and
-# Stored procdures for the TPC-B. The Storage engine currently
-# can be NDBCluster, InnoDB, or MyISAM, but is easly exanded
-# to use other storage engines.
-#------------------------------------------------------------------------
-#
-#-----------------------------------------------
-# Perl Includes
-#-----------------------------------------------
-use DBI;
-use Getopt::Long;
-use IO::File;
-#-----------------------------------------------
-# Globals Vars
-#-----------------------------------------------
-our $our_host='localhost';
-our $our_port='3306';
-our $our_user='root';
-our $our_pass='';
-our $our_database='TPCB2';
-our $dbhM='';
-our $aid=0;
-our $bid=0;
-our $tid=0;
-our $balance=0;
-our $accounts=10000000; #/should be changed for bigger databases
-#our $accounts=1000; #/should be changed for bigger databases
-our $deleteFrom=10000; #/should be changed for bigger databases
-our $c_only=0;
-our $sp_only=0;
-our $our_engine_type='NDB';
-our $our_lfg_name='lg1';
-our $our_ts_name='ts1';
-our $our_diskData=0;
-our $our_mixData=0;
-our $our_num_undo=1;
-our $our_skipLFG=0;
-our $our_num_data=2;
-our $our_cfiles=0;
-our $our_loadFromFiles=0;
-our $our_sockPath='/tmp/mysql.sock';
-our $our_useSock=0;
-our $logFile='./Load_tpcb.log';
-our $fh='';
-our $failed=1;
-our $sth='';
-#-------------------------------------------------
-# Sub Pototypes
-#-------------------------------------------------
-
-sub main ();
-sub CollectCommandPromptInfo ();
-sub ConnectToDatabases ();
-sub DisconnectFromDatabase ();
-sub CreateDB ();
-sub CreateTable ();
-sub LoadTable ();
-sub DeleteFromTable ();
-sub ShowVars ();
-sub Usage ();
-sub FailedSQL ($);
-sub FailedExit ($);
-sub SQL_ExecuteError ($$);
-
-#--------------------------------------------------
-# Program Main
-#--------------------------------------------------
-
-main();
-
-sub main ()
-{
- CollectCommandPromptInfo();
- ConnectToDatabases();
- CreateDB();
- CreateTable();
- LoadTable();
- DeleteFromTable();
- DisconnectFromDatabase();
- $fh->close;
- exit 0
-}
-
-#--------------------------------
-# Usage
-#--------------------------------
-sub Usage ()
-{
- ShowVars();
- die "\n\nProgram: Load TPC-B Database\n
- usage: load_tpcb.pl
- -he [--help] :print usage
-
- -ho [--host=string] :host name (default localhost)
-
- -u [--user=string] :user's name (default root)
-
- -po [--port=int] :port (default 3306)
-
- -sock [--socket] :Connect using socket (default false)
-
- -sp [--spath=string] :socket path and file name
- (default /tmp/mysql.sock)
-
- -pa [--pass=string] :password | Note: leave -pa empty or do not
- include for blank password
- (default null/BLANK)
-
- -e [--engine=string] :engine_type | See Below
-
- -d [--database=string] :database name (default TPCB)
-
- -numA [--numAcc] :Number of rows for accounts table.
- (default == 100,000)
- -ce [--createOnly] :creates the database and tables
- but loads no data. (default false)
-
- -lf [--lfgname} :Log File Group Name. (default lg1)
-
- -numL [--numLFGUndo] :Number of LFG Undo Files. (default 1)
-
- -sk [--skipLFGcreate] :Skip creating the LFG. Use if the LFG
- already exists. (default false)
-
- -t [--tsName] :Table Space Name.(default ts1)
-
- -numT [--numTSData] :Number of Table Space Data Files. (default 2).
-
- -i [--installSPonly] :Only create Stored Procedures (default false)
-
- -lo [--loadFromFiles] :Load data from files (default false)
-
- -cf [--cfiles] :Create data files
-
- Notes: engine == ndb, ndbdd(Disk Data), ndbmix(mix of mem and DD),\n
- ndbcluster, InnoDB, MyISAM\n";
-}
-
-#--------------------------------
-# Show command line values
-#--------------------------------
-
-sub ShowVars ()
-{
- ########## Show the user command line values for debugging #########
- print "*********************************************\n";
- print "************ Command-line values ************\n";
- print "*********************************************\n";
- print "Host ..................... $our_host\n";
- print "User ..................... $our_user\n";
- print "Password ................. $our_pass\n" if ($our_pass ne '');
- print "Password ................. BLANK\n" if ($our_pass eq '');
- print "Port ..................... $our_port\n";
- print "Use Socket To Connect .... TRUE\n" if ($our_useSock);
- print "Use Socket To Connect .... FALSE\n" if (!$our_useSock);
- print "Socket Path .............. $our_sockPath\n" if ($our_useSock);
- print "Database ................. $our_database\n";
- print "Engine Type .............. $our_engine_type\n";
- print "Create Tables Only ....... TRUE\n" if ($c_only);
- print "Create Tables Only ....... FALSE\n" if(!$c_only);
- print "Program Load Data ........ TRUE\n" if(!$c_only &&
- !$our_loadFromFiles);
- print "Load Data From File ...... TRUE\n" if(!$c_only &&
- $our_loadFromFiles);
- print "Number of rows Account.... $accounts\n" if(!$c_only);
- print "Number of rows Branches... $branches\n" if(!$c_only);
- $teller=$branches*2;
- print "Number of rows Teller .... $teller\n" if(!$c_only);
- print "Use Disk Data ............ TRUE\n" if ($diskData || $mixData);
- print "Use Disk Data ............ FALSE\n" if (!$diskData && !$mixData);
- print "LFG Name ................. $our_lfg_name\n" if ($diskData ||
- $mixData);
- print "Create Log File Group .... TRUE\n" if ($diskData ||
- $mixData &&
- !$our_skipLFG);
- print "Create Log File Group .... FALSE\n" if ($diskData ||
- $mixData &&
- $our_skipLFG);
- print "Number LFG Undo File(s)... $our_num_undo\n" if ($diskData ||
- $mixData);
- print "Table Space Name ......... $our_ts_name\n" if ($diskData ||
- $mixData);
- print "Number TS Data Files(s)... $our_num_data\n" if ($diskData ||
- $mixData);
-}
-
-#--------------------------------
-# Collect Command Prompt Info
-#--------------------------------
-sub CollectCommandPromptInfo ()
-{
-
- if (!GetOptions("help"=>\$help,
- "host:s"=>\$our_host,
- "user:s"=>\$our_user,
- "port:i"=>\$our_port,
- "socket"=>\$our_useSock,
- "spath:s"=>\$our_sockPath,
- "pass:s"=>\$our_pass,
- "engine:s"=>\$our_engine_type,
- "database:s"=>\$our_database,
- "createOnly"=>\$c_only,
- "lfgname:s"=>\$our_lfg_name,
- "numLFGUndo:i"=>\$our_num_undo,
- "skipLFGcreate"=>\$our_skipLFG,
- "tsName:s"=>\$our_ts_name,
- "numTSData:i"=>\$our_num_data,
- "numAcc:i"=>\$accounts,
- "installSPonly"=>\$sp_only,
- "loadFromFiles"=>\$our_loadFromFiles,
- "cfiles"=>\$our_cfiles,
- "logfile:s"=>\$logFile))
- {
- Usage();
- }
- if ($help){Usage();}
- $branches=$accounts/10;
- if ($our_useSock){$ENV{MYSQL_UNIX_PORT} = $our_sockPath;}
- if ($our_engine_type ne 'ndb' && $our_engine_type ne 'ndbcluster'
- && $our_engine_type ne 'InnoDB' && $our_engine_type ne 'MyISAM'
- && $our_engine_type ne 'innodb' && $our_engine_type ne 'myisam'
- && $our_engine_type ne 'NDBDD' && $our_engine_type ne 'NDBMIX'
- && $our_engine_type ne 'ndbdd' && $our_engine_type ne 'ndbmix'
- && $our_engine_type ne 'NDB' && $our_engine_type ne 'NDBCLUSTER')
- {
- die Usage();
- }
- if ($our_engine_type eq 'ndbdd'){$our_engine_type = "ndb"; $diskData = 1;}
- if ($our_engine_type eq 'ndbmix'){$our_engine_type = "ndb"; $mixData = 1;}
- if ($our_engine_type eq 'NDBDD'){$our_engine_type = "ndb"; $diskData = 1;}
- if ($our_engine_type eq 'NDBMIX'){$our_engine_type = "ndb"; $mixData = 1;}
- $fh = IO::File->new("$logFile", O_WRONLY|O_APPEND)
- or die "ERROR: could not open $logFile: $!\n";
- print $fh "TPCB_Loader -> CollectCommandPrompt Complete\n";
- #ShowVars();
-}
-
-#---------------------------------------------
-# Connect to database
-#---------------------------------------------
-sub ConnectToDatabases ()
-{
- if (!$our_useSock){
- $dbhM = DBI->connect("dbi:mysql:database=mysql;host=$our_host;port=$our_port",
- "$our_user", "$our_pass",{RaiseError => 0,PrintError =>0})
- or FailedSQL("Can't connect to Master process!\n");
- }
- else{
- $dbhM = DBI->connect("DBI:mysql:database=mysql;host=$our_host",
- "$our_user", "$our_pass", {RaiseError => 0,PrintError =>0})
- or FailedSQL("Can't connect to Master process!");
- }
- print $fh "TPCB_Loader -> Connected to Master!\n";
-}
-
-#-----------------------------------------------
-# Disconnect from database
-#-----------------------------------------------
-sub DisconnectFromDatabase ()
-{
- $dbhM->disconnect
- or warn " Disconnection failed: $DBI::errstr\n";
- print $fh "TPCP_Loader -> Disconnected from MySQLD on $our_host\n";
-}
-
-#-------------------------------------------------
-# Create database
-#-------------------------------------------------
-sub CreateDB ()
-{
- print $fh "TPCB_Loader -> Creating database $our_database!\n";
- $sth = $dbhM->prepare("DROP DATABASE IF EXISTS $our_database;")
- or FailedSQL("Prepare DROP DB error: ");
- $sth->execute();#/Don't care if returns success. No "die" needed
- $sth->finish();
-
- $sth = $dbhM->prepare("CREATE DATABASE $our_database;")
- or FailedSQL("Prepare Create DB error: ");
- $sth->execute()
- or FailedSQL("Create DB Error: ");
- $sth->finish();
-
- $sth = $dbhM->prepare("USE $our_database;")
- or FailedSQL("Prepare USE error: ");
- $sth->execute()
- or FailedSQL("USE DB Error: ");
- $sth->finish();
-
- if($diskData || $mixData && !$our_skipLFG){
- print $fh "TPCB_Loader -> Creating LFG $our_lfg_name....\n";
- $sth = $dbhM->prepare("CREATE LOGFILE GROUP $our_lfg_name
- ADD UNDOFILE './$our_lfg_name/undofile.dat'
- INITIAL_SIZE 250M
- UNDO_BUFFER_SIZE = 4M
- ENGINE=NDB;")
- or FailedSQL("Prepare CREATE LOGFILE GROUP error: ");
- $sth->execute()
- or FailedSQL("CREATE LOGFILE GROUP error: ");
- $sth->finish();
- if($our_num_undo > 1){
- $undo_count = $our_num_undo - 1;
- print $fh "TPCB_Loader -> Adding additional undo files, please stand by....\n";
- while ( $undo_count > 0){
- $file="undofile".$undo_count.".dat";
- print $fh "TPCB_Loader -> Adding undo file $file..\n";
- $sth = $dbhM->prepare("ALTER LOGFILE GROUP $our_lfg_name
- ADD UNDOFILE './$our_lfg_name/$file'
- INITIAL_SIZE 250M
- ENGINE=NDB;")
- or FailedSQL("Prepare ALTER LOGFILE GROUP error: ");
- $sth->execute()
- or FailedSQL("ALTER LOGFILE GROUP error: ");
- $sth->finish();
- $undo_count--;
- }
- }
- }
- if($diskData || $mixData){
- print $fh "TPCB_Loader -> Creating TS $our_ts_name....\n";
- $sth = $dbhM->prepare("CREATE TABLESPACE $our_ts_name
- ADD DATAFILE './$our_ts_name/datafile.dat'
- USE LOGFILE GROUP $our_lfg_name
- INITIAL_SIZE 500M
- ENGINE=NDB;")
- or FailedSQL("Prepare CREATE TABLESPACE error: ");
- $sth->execute()
- or FailedSQL("CREATE TABLESPACE error: ");
- $sth->finish();
-
- if($our_num_data > 1){
- $data_count = $our_num_data - 1;
- while ($data_count > 0){
- $file="datafile".$data_count.".dat";
- print $fh "TPCB_Loader -> Add data file $file\n";
- $sth = $dbhM->prepare("ALTER TABLESPACE $our_ts_name
- ADD DATAFILE './$our_ts_name/$file'
- INITIAL_SIZE 500M
- ENGINE=NDB;")
- or FailedSQL("Prepare ALTER TABLE SPACE error: ");
- $sth->execute()
- or FailedSQL("ALTER TABLE SPACE error: ");
- $sth->finish();
- $data_count--;
- }
- }
- }
- print $fh "TPCB_Loader -> $our_database Created.\n";
-}
-
-#------------------------------------------------------
-# Create tables
-#------------------------------------------------------
-sub CreateTable ()
-{
-
- if(!$diskData){
- print $fh "TPCB_Loader -> Creating Account Table\n";
-
- my $loopCounter = 0;
- $failed = 1;
-
- while ($loopCounter < 4 && $failed == 1){
- $failed = 0;
- $loopCounter++;
- $sth = $dbhM->prepare("CREATE TABLE account (aid INT, bid INT,
- balance DECIMAL(8,2),
- filler CHAR(80),
- PRIMARY KEY (aid))
- ENGINE=$our_engine_type;")
- or FailedSQL("Prepare Create Account Error:");
- $sth->execute()
- or SQL_ExecuteError("Create Account Table Error:",1);
- $sth->finish();
- }
- if($loopCounter == 4){FailedExit("Create Account Table Error:");}
-
- }
- else{
- print $fh "TPCB_Loader -> Creating Account Table\n";
- $sth = $dbhM->prepare("CREATE TABLE account (aid INT, bid INT,
- balance DECIMAL(8,2),
- filler CHAR(80),
- PRIMARY KEY (aid))
- TABLESPACE $our_ts_name
- STORAGE DISK ENGINE=$our_engine_type;")
- or FailedSQL("Prepare Create Account DD Error: ");
- $sth->execute()
- or FailedSQL("Create DD Account Table Error: ");
- $sth->finish();
-
- }
-
- print $fh "TPCB_Loader -> Table Created!\n";
-}
-
-#-----------------------------------------------
-# Load tables
-#-----------------------------------------------
-sub LoadTable ()
-{
- print $fh "TPCB_Loader -> Loading table\n";
- #print "Loading accounts table -- Please wait\n";
- $sth = $dbhM->prepare("INSERT into account VALUES(?, ?, ?, ?);")
- or FailedSQL("Prepare insert into account error: ");
-
- $i=0;
- while($i < $accounts){
- $i++;
- $aid++;
- $sth->bind_param(1, $aid);
- $sth->bind_param(2, $aid);
- $sth->bind_param(3, $balance);
- $sth->bind_param(4, "Going fishing");
- $sth->execute()
- or FailedSQL("insert into account Error: ");
- }
- $sth->finish();
-}
-#-----------------------------------------------
-# Delete Data
-#-----------------------------------------------
-sub DeleteFromTable ()
-{
-
- $i=$deleteFrom;
- print $fh "TPCB_Loader -> delete from table\n";
- while($i < $accounts){
- #print "Loading accounts table -- Please wait\n";
- $sth = $dbhM->prepare("DELETE FROM $our_database.account WHERE aid = ?;")
- or FailedSQL("Prepare delete from account error: ");
-
- $i++;
- $aid++;
- $sth->bind_param(1, $aid);
- $sth->execute()
- or FailedSQL("delete from account error");
- $sth->finish();
- }
-}
-sub FailedSQL ($)
-{
- $msg = shift;
- print $fh "TPCB_load -> $msg\n";
- $msg = $DBI::err;
- print $fh "Err#: $msg\n";
- $msg = $DBI::errstr;
- print $fh "Err-> $msg\n";
- $fh->close;
- print 1;
- exit 1;
-}
-
-sub SQL_ExecuteError($$)
-{
- $msg = shift;
- $show = shift;
- print $fh "$msg\n";
- my $showResults=$sth->err;
- my $showResults2=$sth->errstr;
- print $fh "Err#: $showResults\n";
- print $fh "Err-> $showResults2\n";
- if($show){
- my $showResults3='';
- my $ShowNDB_sth = $dbhM->prepare("SHOW ENGINE NDB STATUS;")
- or die "Prepare SHOW ENGINE NDB STATUS: ", $dbhM->errstr;
- $ShowNDB_sth->execute();
- $ShowNDB_sth->bind_col (1, \$showResults);
- $ShowNDB_sth->bind_col (2, \$showResults2);
- $ShowNDB_sth->bind_col (3, \$showResults3);
- print $fh "**** SHOW ENGINE STATUS ****\n";
- while($ShowNDB_sth->fetch()){
- print $fh "------------------------------------\n";
- print $fh "$showResults\n";
- print $fh "$showResults2\n";
- print $fh "$showResults3\n";
- }
- }
- sleep 10;
- $failed = 1;
-}
-
-sub FailedExit ($)
-{
- $msg = shift;
- print $fh "TPCB_load -> $msg\n";
- $fh->close;
- print 1;
- exit 1;
-}
-
-################### End of script #############
=== removed file 'tests/tpcb/extras/loop.sh'
--- a/tests/tpcb/extras/loop.sh 2008-10-29 21:41:06 +0000
+++ b/tests/tpcb/extras/loop.sh 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-while true
- do
- perl load_and_delete.pl --port=15002 --host=ndb18 --log=/space/cluster_rep_auto/logs/tpcb.log
-done
=== modified file 'tests/tpcb/tpcbSql'
Binary files a/tests/tpcb/tpcbSql 2008-12-17 15:05:57 +0000 and b/tests/tpcb/tpcbSql 2009-02-13 21:08:34 +0000 differ
=== modified file 'tests/tpcb/tpcbSql_src/src/tpcb.cpp'
--- a/tests/tpcb/tpcbSql_src/src/tpcb.cpp 2008-10-29 21:41:06 +0000
+++ b/tests/tpcb/tpcbSql_src/src/tpcb.cpp 2009-02-13 21:08:34 +0000
@@ -344,6 +344,8 @@ void tpcb::SetSeed()
mov dword ptr [rand_seed.timerlo],eax
popa
}
+ #elif defined(sparc)
+ rand_seed.timerlo = 4711;
#elif defined(COMPILER_GCC)
// GCC syntax for getting timer rdtsc into edx:eax
asm __volatile__
=== modified file 'tools/mail.list'
--- a/tools/mail.list 2008-12-15 22:13:26 +0000
+++ b/tools/mail.list 2009-02-13 21:08:34 +0000
@@ -3,4 +3,3 @@ name->jmiller@stripped
name->bernhard.ocklin@stripped
name->gunn.olaussen@stripped
name->geir.green@stripped
-name->wen.xiong@stripped
=== modified file 'tools/resultsDBinit.pl'
--- a/tools/resultsDBinit.pl 2008-12-17 15:05:57 +0000
+++ b/tools/resultsDBinit.pl 2009-02-13 21:08:34 +0000
@@ -399,7 +399,7 @@ sub trim($)
my $string = shift;
if (!defined $string)
{
- print "String not defined in sub Trim()\n";
+ #print "String not defined in sub Trim()\n";
return
}
$string =~ s/^\s+//;
=== modified file 'tools/resultsDBreport.pl'
--- a/tools/resultsDBreport.pl 2008-12-17 15:05:57 +0000
+++ b/tools/resultsDBreport.pl 2009-02-13 21:08:34 +0000
@@ -68,8 +68,10 @@ our $atomics=0;
our $devationWarning=0;
our $prevRun=1;
our $foundPrevHosts=0;
-our $debug=1;
+our $debug=0;
our $failed=0;
+our $revno=0;
+our $tStamp="";
#-------------------------------------------------
# Sub Pototypes
@@ -459,6 +461,21 @@ sub ReadFilesForInfo()
print "cnf = $cfg\n";
}
}
+ if ($_ =~ /(?i)revno:/){
+ ($trash, $revno) = split(/:/);
+ $revno= trim($revno);
+ if ($debug && defined $revno){
+ print "revno = $revno\n";
+ }
+ }
+ if ($_ =~ /(?i)timestamp:/){
+ ($trash, $tStamp) = split(/:/);
+ if ($debug && defined $tStamp){
+ print "Time Stamp = $tStamp\n";
+ }
+ }
+
+
}
CloseFile (*fh);
@@ -509,6 +526,8 @@ sub WriteReport()
print $fh "----------------------------------------------------------------\n";
print $fh "Results Date: $curRunStart\n";
print $fh "Revision ID: $curRev\n";
+ print $fh "Revision NO: $revno\n";
+ print $fh "Rev Date: $tStamp\n";
print $fh "\n";
if (!$atomics){print $fh "Thread(s) Value(s)\n";}
else{print $fh "Test Type Value(s)\n";}
=== added file 'tools/timer.pl'
--- a/tools/timer.pl 1970-01-01 00:00:00 +0000
+++ b/tools/timer.pl 2009-02-13 21:08:34 +0000
@@ -0,0 +1,178 @@
+#---------------------------------------------------------------------
+#/* Copyright (C) 2009-2015 Sun Microsystems
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Version 1.1
+#------------------------------------------------------------------------
+# Purpose: To return time values for test drivers
+#------------------------------------------------------------------------
+#-----------------------------------------------
+# Perl Includes
+#-----------------------------------------------
+use Time::Local;
+use Time::localtime;
+use Getopt::Long;
+use IO::File;
+#-----------------------------------------------
+# Globals Vars
+#-----------------------------------------------
+our $timesFile="./testTimes.log";
+our $testName="default";
+our $testOp="load";
+our $tmpFile="/tmp/timer.tmp";
+our $debug=0;
+our $end=0;
+
+#-------------------------------------------------
+# Sub Pototypes
+#-------------------------------------------------
+sub main ();
+sub CollectCommandPromptInfo ();
+sub SetStartTime();
+sub SetEndTime();
+sub OpenFileRead ($$);
+sub OpenFileAppend ($$);
+sub Usage ();
+sub CloseFile ($);
+
+#--------------------
+# Main Functions
+#--------------------
+
+main();
+
+sub main ()
+{
+ CollectCommandPromptInfo();
+ if(!$end)
+ {
+ SetStartTime();
+ }
+ else
+ {
+ SetEndTime();
+ }
+ exit 0;
+}
+
+sub SetStartTime()
+{
+ local $fh;
+ OpenFileAppend (*fh,$tmpFile);
+ local $startTime = time;
+ print $fh "$testName,$testOp,$startTime\n";
+ CloseFile (*fh);
+ return;
+}
+sub SetEndTime()
+{
+ local $fh;
+ OpenFileRead (*fh,$tmpFile);
+ while (<$fh>)
+ {
+ chomp;
+ ($testName, $testOp, $startTime) = split(/,/);
+ $testName = trim($testName);
+ $testOp = trim($testOp);
+ $startTime = trim($startTime);
+ if($debug)
+ {
+ print "Test Name = $testName\n";
+ print "Test Op = $testOp\n";
+ print "StartTime = $startTime\n";
+ }
+ }
+ CloseFile (*fh);
+ system("rm $tmpFile");
+ local $totalTime = (time - $startTime);
+ OpenFileAppend (*fh,$timesFile);
+ if($debug)
+ {
+ print "Test Name = $testName\n";
+ print "Test Op = $testOp\n";
+ print "Total Time = $totalTime\n";
+ print "File = $timesFile\n";
+ print "$testName,$testOp,$totalTime\n";
+ }
+ print $fh "$testName,$testOp,$totalTime\n";
+ CloseFile (*fh);
+ return;
+}
+
+#---------------------------------------------
+# File OPS
+#---------------------------------------------
+sub OpenFileRead ($$){
+ local *handle = $_[0];
+ local $file = $_[1];
+ $handle = IO::File->new("$file", O_RDONLY)
+ or die "ERROR: could not open $file: $!\n";
+}
+#--------------------
+sub OpenFileAppend ($$)
+{
+ local *handle = $_[0];
+ local $file = $_[1];
+ if (-e $file){
+ $handle = IO::File->new("$file", O_WRONLY|O_APPEND)
+ or die "ERROR: could not append $file: $!\n";
+ }
+ else{
+ OpenFileForWrite(*handle, $file);
+ }
+}
+
+sub OpenFileForWrite ($$){
+ local *handle = $_[0];
+ local $file = $_[1];
+ $handle = IO::File->new("$file", O_WRONLY|O_TRUNC|O_CREAT)
+ or die "ERROR: could not open $file: $!\n";
+}
+
+#--------------------
+sub CloseFile ($)
+{
+ local *handle = $_[0];
+ $handle->close;
+}
+#---------------------------------------------
+# Helper Function
+#---------------------------------------------
+sub trim($)
+{
+ my $string = shift;
+ if (!defined $string)
+ {
+ print "RB UPDATE -> String not defined in sub Trim()\n";
+ return
+ }
+ $string =~ s/^\s+//;
+ $string =~ s/\s+$//;
+ return $string;
+}
+#----------------------------
+sub CollectCommandPromptInfo ()
+{
+ if (!GetOptions("timesFile:s"=>\$timesFile,
+ "testName:s"=>\$testName,
+ "testOp:s"=>\$testOp,
+ "tmpFile:s"=>\$tmpFile,
+ "end"=>\$end,
+ "debug"=>\$debug))
+ {
+ print "Unknown command line parameter!\n";
+ exit 1;
+ }
+}
+
| Thread |
|---|
| • bzr commit into file:///space/cluster_rep_auto/ branch (Jonathan.Miller:20) | Jonathan.Miller | 13 Feb |
