#At file:///space/cluster_rep_auto/ based on revid:jonathan.miller@stripped
22 Jonathan.Miller@stripped 2009-02-27
Lastest version to update base
added:
atrt-tests-lists/linux.ndb18/4-dn-perf-6.4-tests.txt
configurations/linux.ndb18/conf-4-dn-perf-6.4.cnf
drivers/ins-del-dd-tester.sh
drivers/tpcb-dd-tester.sh
tests/cge/sql/sc/dbCleanupDATA1.sql
tests/cge/sql/sc/dbCleanupDATA2.sql
tests/cge/sql/sc/dbCleanupDB.sql
tests/cge/sql/sc/dbCleanupLFG.sql
tests/cge/sql/sc/dbCleanupTS.sql
tools/add_ops.sh
modified:
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-mt-6-tests.txt
atrt-tests-lists/linux.ndb18/4-dn-mt-8-mixed-tests.txt
atrt-tests-lists/linux.ndb18/4-dn-mt-8-tests.txt
atrt-tests-lists/linux.ndb18/4-dn-perf-tests.txt
configurations/linux.ndb18/2-dn-tpcb.cnf
configurations/linux.ndb18/conf-2-dn-mt-8-mixed.cnf
configurations/linux.ndb18/conf-2-dn-perf.cnf
drivers/add-online-tester.sh
drivers/cge-tester.sh
drivers/ins-del-rep-tester.sh
drivers/ins-del-tester.sh
drivers/joins-tester.sh
drivers/ndbatomics-dd-tester.sh
drivers/ndbatomics-tester.sh
drivers/restore-tester.sh
drivers/sony-tester.sh
drivers/sysbench-oltp-tester.sh
drivers/tpcb-tester.sh
drivers/tpcc-dd-rep-tester.sh
drivers/tpcc-dd-tester.sh
drivers/tpcc-tester.sh
scripts/boot.sh
scripts/cleanup.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/insert_delete/load_and_delete.pl
tests/joinAtomics/src/JoinsTest
tests/ndbatomics/src/NDBAtomics
tests/tpcb/tpcbSql
tests/tpcb/tpcbSql_driver.pl
tests/tpcb/tpcbSql_src/src/support.h
tests/tpcb/tpcbSql_src/src/tpcb.cpp
tests/tpcb/tpcbSql_src/src/tpcb.h
tests/tpcb/tpcbSql_src/src/tpcbSql.cpp
tests/tpcb/tpcb_load_db.pl
tools/create_dd.sh
tools/resultsDBreport.pl
tools/resultsDBupdate.pl
tools/verify_slave.pl
=== 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 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-mt-6-tests.txt 2009-02-27 18:32:22 +0000
@@ -11,6 +11,14 @@ max-time: 4000
cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
max-time: 4000
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -20,7 +28,6 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-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 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-mt-8-mixed-tests.txt 2009-02-27 18:32:22 +0000
@@ -11,6 +11,14 @@ max-time: 4000
cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
max-time: 4000
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -20,7 +28,6 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-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 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-mt-8-tests.txt 2009-02-27 18:32:22 +0000
@@ -11,6 +11,14 @@ max-time: 4000
cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
max-time: 4000
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -20,7 +28,6 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-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 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-mt-tests.txt 2009-02-27 18:32:22 +0000
@@ -11,6 +11,14 @@ max-time: 4000
cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
max-time: 4000
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -20,7 +28,6 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-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 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/2-dn-perf-tests.txt 2009-02-27 18:32:22 +0000
@@ -20,6 +20,14 @@ cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -28,7 +36,7 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-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 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-mt-6-tests.txt 2009-02-27 18:32:22 +0000
@@ -11,6 +11,14 @@ max-time: 4000
cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
max-time: 4000
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -20,7 +28,6 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-tester.sh
args:../../../bin/cr-autotest.conf
-
=== modified 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 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-mt-8-mixed-tests.txt 2009-02-27 18:32:22 +0000
@@ -20,6 +20,14 @@ cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -28,7 +36,7 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-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 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-mt-8-tests.txt 2009-02-27 18:32:22 +0000
@@ -11,6 +11,14 @@ max-time: 4000
cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
+max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
max-time: 4000
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -20,7 +28,6 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-tester.sh
args:../../../bin/cr-autotest.conf
-
=== added file 'atrt-tests-lists/linux.ndb18/4-dn-perf-6.4-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/4-dn-perf-6.4-tests.txt 1970-01-01 00:00:00 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-perf-6.4-tests.txt 2009-02-27 18:32:22 +0000
@@ -0,0 +1,13 @@
+# BASIC FUNCTIONALITY
+max-time: 4600
+cmd: ins-del-dd-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/4-dn-perf-tests.txt'
--- a/atrt-tests-lists/linux.ndb18/4-dn-perf-tests.txt 2009-02-13 21:08:34 +0000
+++ b/atrt-tests-lists/linux.ndb18/4-dn-perf-tests.txt 2009-02-27 18:32:22 +0000
@@ -20,6 +20,14 @@ cmd: ndbatomics-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
+cmd: ins-del-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
+cmd: ins-del-dd-tester.sh
+args:../../../bin/cr-autotest.conf
+
+max-time: 4600
cmd: tpcc-dd-tester.sh
args:../../../bin/cr-autotest.conf
@@ -28,7 +36,7 @@ cmd: ndbatomics-dd-tester.sh
args:../../../bin/cr-autotest.conf
max-time: 4600
-cmd: ins-del-tester.sh
+cmd: tpcb-dd-tester.sh
args:../../../bin/cr-autotest.conf
=== modified file 'configurations/linux.ndb18/2-dn-tpcb.cnf'
--- a/configurations/linux.ndb18/2-dn-tpcb.cnf 2009-02-13 21:08:34 +0000
+++ b/configurations/linux.ndb18/2-dn-tpcb.cnf 2009-02-27 18:32:22 +0000
@@ -9,12 +9,7 @@ clusters= .master
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
@@ -26,20 +21,6 @@ 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
=== modified file 'configurations/linux.ndb18/conf-2-dn-mt-8-mixed.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-mt-8-mixed.cnf 2009-02-13 21:08:34 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-mt-8-mixed.cnf 2009-02-27 18:32:22 +0000
@@ -21,7 +21,7 @@ MaxNoOfExecutionThreads=8
MaxNoOfSavedMessages = 30
NoOfReplicas = 2
DataMemory = 8000M
-IndexMemory = 1000M
+IndexMemory = 2000M
DiskPageBufferMemory=300MB
DiskCheckpointSpeed=16M
RedoBuffer=200M
=== modified file 'configurations/linux.ndb18/conf-2-dn-perf.cnf'
--- a/configurations/linux.ndb18/conf-2-dn-perf.cnf 2009-02-13 21:08:34 +0000
+++ b/configurations/linux.ndb18/conf-2-dn-perf.cnf 2009-02-27 18:32:22 +0000
@@ -10,10 +10,8 @@ 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
+#loose-ndb-cluster-connection-pool=4
+loose-ndb-cluster-connection-pool=3
[cluster_config]
MaxNoOfSavedMessages = 30
@@ -34,11 +32,11 @@ MaxNoOfAttributes=2048
MaxNoOfOrderedIndexes=512
MaxNoOfUniqueHashIndexes=512
DiskPageBufferMemory=300MB
-LockPagesInMainMemory=1
+#LockPagesInMainMemory=1
DiskCheckpointSpeed=16M
-MemReportFrequency=200
-LogLevelCongestion=15
-LogLevelStatistic=15
+#MemReportFrequency=200
+#LogLevelCongestion=15
+#LogLevelStatistic=15
[cluster_config.master]
ndb_mgmd = CHOOSE_host2
=== added file 'configurations/linux.ndb18/conf-4-dn-perf-6.4.cnf'
--- a/configurations/linux.ndb18/conf-4-dn-perf-6.4.cnf 1970-01-01 00:00:00 +0000
+++ b/configurations/linux.ndb18/conf-4-dn-perf-6.4.cnf 2009-02-27 18:32:22 +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
+DiskIOThreadPool=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 'drivers/add-online-tester.sh'
--- a/drivers/add-online-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/add-online-tester.sh 2009-02-27 18:32:22 +0000
@@ -91,10 +91,10 @@ check_sub(){
header()
{
- print_date
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 -> Configuration file has been loaded..." > ${LOGFILE}
+ print_date
+ echo "Script -> add-online-tester.sh is running..." >> ${LOGFILE}
}
########################## RUN TEST ##########################
=== modified file 'drivers/cge-tester.sh'
--- a/drivers/cge-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/cge-tester.sh 2009-02-27 18:32:22 +0000
@@ -59,7 +59,11 @@ SC_QUERY_3=$SC_SQL/sc_query_3.sql
SC_QUERY_4=$SC_SQL/sc_query_4.sql
SC_QUERY_5=$SC_SQL/sc_query_5.sql
SC_CREATE_DB=$SC_SQL/createDB.sql
-SC_CLEAN_UP=$SC_SQL/dbCleanup.sql
+SC_CLEAN_DB=$SC_SQL/dbCleanupDB.sql
+SC_CLEAN_DATA1=$SC_SQL/dbCleanupDATA1.sql
+SC_CLEAN_DATA2=$SC_SQL/dbCleanupDATA2.sql
+SC_CLEAN_TS=$SC_SQL/dbCleanupTS.sql
+SC_CLEAN_LFG=$SC_SQL/dbCleanupLFG.sql
SC_DUMP=$CGE_DATA/sc/sc_dump.sql
# NP SQL
@@ -103,7 +107,7 @@ if [ `uname -s` != "SunOS" ]
trap failed HUP INT QUIT PIPE TERM
fi
-OPS_TIMER="$OPS_TIMER --testName=cge-tester"
+OPS_TIMER="$OPS_TIMER --testName=CGE"
#--------------------
# Script Functions
@@ -211,7 +215,7 @@ load_sc()
$OPS_TIMER --end
check_sql
fi
- echo "Script -> Load for numberportability Complete.." >> ${LOGFILE}
+ echo "Script -> Load for SC Complete.." >> ${LOGFILE}
}
run_sc()
@@ -250,9 +254,26 @@ drop_sc()
line
echo "Script -> Dropping SC Database.. " >> ${LOGFILE}
$OPS_TIMER --testOp="DROP DB SC"
- $MYSQL_MASTER < ${SC_CLEAN_UP} >> ${SQL_LOG} 2>&1
+ $MYSQL_MASTER < ${SC_CLEAN_DB} >> ${SQL_LOG} 2>&1
$OPS_TIMER --end
check_sql
+ $OPS_TIMER --testOp="DROP SC DATA 1"
+ $MYSQL_MASTER < ${SC_CLEAN_DATA1} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ $OPS_TIMER --testOp="DROP SC DATA 2"
+ $MYSQL_MASTER < ${SC_CLEAN_DATA2} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ $OPS_TIMER --testOp="DROP SC TS"
+ $MYSQL_MASTER < ${SC_CLEAN_TS} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+ $OPS_TIMER --testOp="DROP SC LFG"
+ $MYSQL_MASTER < ${SC_CLEAN_LFG} >> ${SQL_LOG} 2>&1
+ $OPS_TIMER --end
+ check_sql
+
echo "Script -> Drop of SC Database Complete.. " >> ${LOGFILE}
}
=== added file 'drivers/ins-del-dd-tester.sh'
--- a/drivers/ins-del-dd-tester.sh 1970-01-01 00:00:00 +0000
+++ b/drivers/ins-del-dd-tester.sh 2009-02-27 18:32:22 +0000
@@ -0,0 +1,181 @@
+#!/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-dd.log
+RPTFILE=${TESTCASE_LOG_DIR}/ins-del-dd.rpt
+CSVFILE=${TESTCASE_LOG_DIR}/ins-del-dd.csv
+PKFILE=${TESTCASE_LOG_DIR}/ins-del-dd.pk
+INFOFILE=${TESTCASE_LOG_DIR}/ins-del-dd.info
+PERF_REPORT=${TESTCASE_LOG_DIR}/ins-del-dd-perf.rpt
+TEST_DIR=${TEST_SCRIPTS_DIR}/insert_delete
+LINE="==========================================="
+BLOB=${TEST_DIR}/logo-mysql.jpg
+DELINS=100000
+ROWS=250000
+# Disk Data
+NUMLOGS=3
+LOGSIZE="500M"
+NUMDATA=40
+DATASIZE="600M"
+
+
+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} -e ndbdd -numL ${NUMLOGS} -un 250M -numT 40 -tsS 600M"
+TEST="${TEST} -un ${LOGSIZE} -numT ${NUMDATA} -tsS ${DATASIZE}"
+
+INIT_RDB="${INIT_RDB} -testN LOAD-DELETE-DD -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
+ update_bm
+ 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()
+{
+ echo "ins-del-dd-tester.sh"
+ echo "Script -> ins-del-dd-tester.sh is running..." > ${LOGFILE}
+ print_date
+ 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-DD" >> ${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}
+ 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/ins-del-rep-tester.sh'
--- a/drivers/ins-del-rep-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/ins-del-rep-tester.sh 2009-02-27 18:32:22 +0000
@@ -34,9 +34,15 @@ fi
#########################
LOGFILE=$TESTCASE_LOG_DIR/ins-del-rep.log
TPCB_DIR=$TEST_SCRIPTS_DIR/tpcb
+TEST_DIR=${TEST_SCRIPTS_DIR}/insert_delete
+RPTFILE=${TESTCASE_LOG_DIR}/ins-del-rep.rpt
+CSVFILE=${TESTCASE_LOG_DIR}/ins-del-rep.csv
LINE="==========================================="
PORT=15002
SPORT=15004
+BLOB=${TEST_DIR}/logo-mysql.jpg
+DELINS=100000
+ROWS=250000
WFSQLR="$PERL $WAIT_FOR_READY"
WFSQLR="$WFSQLR --log=$LOGFILE --mpo $MASTER_PORT"
@@ -44,14 +50,16 @@ WFSQLR="$WFSQLR --spo $SLAVE_PORT --mho
LOAD="$PERL $TPCB_DIR/extras/load_and_delete.pl --database=insDel"
LOAD="$LOAD --port=$PORT --host=$MASTER --log=$LOGFILE"
-LOAD2="$PERL $TPCB_DIR/extras/load_and_delete.pl --database=insDel"
-LOAD2="$LOAD2 --port=$MASTER_PORT --host=$MASTER --log=$LOGFILE"
+LOAD2="$PERL ${TEST_DIR}/load_and_delete.pl --database=insDel"
+LOAD2="$LOAD2 --port=${MASTER_PORT} --host=${MASTER} --log=${LOGFILE}"
+LOAD2="$LOAD2 --blob=${BLOB} -i ${DELINS} -ro ${ROWS} -c ${CSVFILE}"
+LOAD2="$LOAD2 -re ${RPTFILE}"
VERIFY="$PERL $SLAVE_VERIFICATION"
VERIFY="$VERIFY -mho $MASTER -sho $SLAVE -mpo $MASTER_PORT"
VERIFY="$VERIFY -spo $SLAVE_PORT -vD insDel"
VERIFY="$VERIFY -bin $INSTALL_BIN_DIR -log $LOGFILE"
-VERIFY="$VERIFY --test=ins_del -f $TESTCASE_LOG_DIR --verifyDrop"
+VERIFY="$VERIFY --test=ins-del-rep -f $TESTCASE_LOG_DIR --verifyDrop"
############################
# Run Tests
=== modified file 'drivers/ins-del-tester.sh'
--- a/drivers/ins-del-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/ins-del-tester.sh 2009-02-27 18:32:22 +0000
@@ -38,6 +38,7 @@ 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
+INFOFILE=${TESTCASE_LOG_DIR}/ins-del.info
PERF_REPORT=${TESTCASE_LOG_DIR}/ins-del-perf.rpt
TEST_DIR=${TEST_SCRIPTS_DIR}/insert_delete
LINE="==========================================="
@@ -55,9 +56,9 @@ INIT_RDB="${INIT_RDB} -testN LOAD-DELETE
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}"
+UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE} --delIns"
-RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFOFILE} -re ${PERF_REPORT}"
+RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFOFILE} -re ${PERF_REPORT} --delIns"
#--------------------
# Script Functions
@@ -80,6 +81,7 @@ failed()
print_date
echo "exit->1" >> ${INFOFILE}
end_time
+ update_bm
echo ${FAILURE} >> ${LOGFILE}
echo ${FAILURE}
exit 1
@@ -103,10 +105,10 @@ run()
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}
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
+ print_date
+ echo "Script -> ins-del-tester.sh is running..." >> ${LOGFILE}
}
finish()
@@ -130,15 +132,14 @@ update_info()
line
echo ${INIT_RDB} >> ${LOGFILE}
${INIT_RDB}
- line
fi
}
update_bm()
{
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${UPDATE_RDB} >> ${LOGFILE}
line
+ echo ${UPDATE_RDB} >> ${LOGFILE}
${UPDATE_RDB}
fi
}
@@ -146,8 +147,8 @@ update_bm()
results_rpt()
{
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${RESULTS_REPORT} >> ${LOGFILE}
line
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
${RESULTS_REPORT}
fi
}
@@ -166,7 +167,7 @@ header
update_info
run
update_bm
-#results_rpt
+results_rpt
finish
#---------------
=== modified file 'drivers/joins-tester.sh'
--- a/drivers/joins-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/joins-tester.sh 2009-02-27 18:32:22 +0000
@@ -55,7 +55,7 @@ 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"
+OPS_TIMER="${OPS_TIMER} --testName=JOINS"
#------------------
# Script Functions
@@ -169,8 +169,8 @@ print_date()
header()
{
- line
- echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
+ print_date
echo "Script -> joins-tester.sh is running..." > ${LOGFILE}
echo "Script -> joins-tester.sh"
}
=== modified file 'drivers/ndbatomics-dd-tester.sh'
--- a/drivers/ndbatomics-dd-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/ndbatomics-dd-tester.sh 2009-02-27 18:32:22 +0000
@@ -33,6 +33,7 @@ fi
# Set Variables
#----------------
+FAILED=0
DB=ndbatomics
LINE="==========================================="
#FILES/DIRS
@@ -50,13 +51,15 @@ TEST_RUN_TIME=300
GROUP_OPS=900
EXE=${NDBA_SRC_DIR}/NDBAtomics
#LOAD
-NUMDATA=20
+NUMDATA=40
NUMUNDO=3
-DATAFILESIZE="400M"
+DATAFILESIZE="100M"
UNDOSIZE="1000M"
UNDOBUFFER="400M"
LOAD_DB="${PERL} ${NDBA_DIR}/load_atomics.pl"
NUMOFROWS=1000000
+LFG="a_lfg"
+TABLESPACE="a_ts"
#UPDATE_BM_DATABASE=""
@@ -66,6 +69,8 @@ LOAD="${LOAD} --host=${MASTER} --user=ro
LOAD="${LOAD} -numL ${NUMUNDO} --lfgFileSize=${UNDOSIZE}"
LOAD="${LOAD} --numTSData=${NUMDATA} --tsFileSize=${DATAFILESIZE}"
LOAD="${LOAD} --numAcc=${NUMOFROWS}"
+LOAD="${LOAD} -lfgn ${LFG}"
+LOAD="${LOAD} -tsn ${TABLESPACE}"
#Test Driver
DRIVER="${EXE} -c ${NDB_MASTER}:${NDB_MASTER_PORT}"
@@ -84,9 +89,10 @@ RESULTS_REPORT="${RESULTS_REPORT} -l ${L
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="${VERIFY} -log ${LOGFILE} --test=${DB}-dd -rdd --dropOnly -num ${NUMDATA}"
+VERIFY="${VERIFY} -lfgN ${LFG} -tsN ${TABLESPACE}"
-OPS_TIMER="${OPS_TIMER} --testName=ndbatomics-dd-tester"
+OPS_TIMER="${OPS_TIMER} --testName=NDB-ATOMICS-DD"
#---------------------
# Script Functions
@@ -101,7 +107,6 @@ end_time()
{
ENDTIME=`date +'%F %T'`
echo "end->${ENDTIME}" >> ${INFO_FILE}
- echo "exit->0" >> ${INFO_FILE}
}
print_date()
@@ -116,9 +121,8 @@ failed()
print_date
echo "exit->1" >> ${INFO_FILE}
end_time
- if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- ${UPDATE_RDB}
- fi
+ update_bm
+ FAILED=1
clean
echo $FAILURE
exit 1
@@ -141,7 +145,6 @@ load(){
run()
{
line
- print_date
echo "Script -> Running Test" >> ${LOGFILE}
${DRIVER}
RC=$?
@@ -149,8 +152,7 @@ run()
echo "Script ->run failed!!!!!" >> ${LOGFILE}
failed
fi
- print_date
- echo "Script -> Running Test" >> ${LOGFILE}
+ echo "exit->0" >> ${INFO_FILE}
}
clean()
@@ -160,39 +162,35 @@ clean()
${OPS_TIMER} --testOp="DROP DB & DD"
${VERIFY}
${OPS_TIMER} --end
+ if [ ${FAILED} -eq 0 ];then
+ results_report
+ finish
+ fi
}
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
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
+ print_date
+ echo "Script -> ndbatomics-dd-tester.sh is running..." >> ${LOGFILE}
}
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
+ 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
- print_date
echo ${INIT_RDB} >> ${LOGFILE}
${INIT_RDB}
- line
fi
}
@@ -200,9 +198,7 @@ update_bm()
{
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
line
- print_date
echo ${UPDATE_RDB} >> ${LOGFILE}
- line
${UPDATE_RDB}
fi
}
@@ -210,13 +206,17 @@ results_report()
{
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
line
- print_date
echo ${RESULTS_REPORT} >> ${LOGFILE}
- line
${RESULTS_REPORT}
fi
}
+finish()
+{
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+}
+
#-------------
# Run Tests
#-------------
@@ -224,12 +224,9 @@ results_report()
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 2009-02-13 21:08:34 +0000
+++ b/drivers/ndbatomics-tester.sh 2009-02-27 18:32:22 +0000
@@ -32,7 +32,7 @@ fi
#----------------
# Set Variables
#----------------
-
+FAILED=0
DB=ndbatomics
LOGFILE=${TESTCASE_LOG_DIR}/${DB}.log
PK_FILE=${TESTCASE_LOG_DIR}/${DB}.pk
@@ -71,7 +71,7 @@ UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE}"
RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFO_FILE} -re ${PERF_REPORT}"
RESULTS_REPORT="${RESULTS_REPORT} --atomics"
-OPS_TIMER="${OPS_TIMER} --testName=ndbatomics-tester"
+OPS_TIMER="${OPS_TIMER} --testName=NDB-ATOMICS"
#------------------
# Script Functions
@@ -86,7 +86,6 @@ end_time()
{
ENDTIME=`date +'%F %T'`
echo "end->${ENDTIME}" >> ${INFO_FILE}
- echo "exit->0" >> ${INFO_FILE}
}
print_date()
@@ -101,9 +100,9 @@ failed()
print_date
echo "exit->1" >> ${INFO_FILE}
end_time
- if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- ${UPDATE_RDB}
- fi
+ FAILED=1
+ clean
+ update_bm
echo ${FAILURE}
exit 1
}
@@ -114,7 +113,7 @@ load()
echo "Script -> Calling Load..." >> ${LOGFILE}
${OPS_TIMER} --testOp="LOAD NDBATOMICS DB"
${LOAD}
- RC=$?
+ RC=${?}
if [ ${RC} -ne 0 ]; then
${OPS_TIMER} --end
echo "Script -> Load failed" >> ${LOGFILE}
@@ -125,15 +124,15 @@ load()
run()
{
- print_date
+ line
echo "Script -> Running Test" >> ${LOGFILE}
${DRIVER}
- RC=$?
+ RC=${?}
if [ ${RC} -ne 0 ]; then
echo "Script ->run failed!!!!!" >> ${LOGFILE}
failed
fi
- print_date
+ echo "exit->0" >> ${INFO_FILE}
echo "Script -> Run Complete " >> ${LOGFILE}
}
@@ -144,34 +143,33 @@ clean()
${OPS_TIMER} --testOp="DROP DB NDBATOMICS"
$MYSQL_MASTER < ${DROP_DB} >> ${LOGFILE} 2>&1
${OPS_TIMER} --end
+ if [ ${FAILED} -eq 0 ];then
+ results_rpt
+ finish
+ fi
}
header()
{
- print_date
echo "Script -> ndbatomics-tester.sh..."
echo "Script -> ndbatomics-tester.sh is running..." > ${LOGFILE}
+ print_date
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}
+ 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
+ echo ${INIT_RDB} >> ${LOGFILE}
${INIT_RDB}
fi
}
@@ -179,8 +177,8 @@ init_bm()
update_bm()
{
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${UPDATE_RDB} >> ${LOGFILE}
line
+ echo ${UPDATE_RDB} >> ${LOGFILE}
${UPDATE_RDB}
fi
}
@@ -188,8 +186,8 @@ update_bm()
results_rpt()
{
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- echo ${RESULTS_REPORT} >> ${LOGFILE}
line
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
${RESULTS_REPORT}
fi
}
@@ -209,11 +207,10 @@ finish()
header
load
update_info
-init_bm
run
end_time
+update_bm
clean
-finish
#-------------
#End of script
=== modified file 'drivers/restore-tester.sh'
--- a/drivers/restore-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/restore-tester.sh 2009-02-27 18:32:22 +0000
@@ -194,10 +194,10 @@ print_date()
header()
{
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
print_date
- echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
echo "restore-tester.sh"
- echo "Script -> restore-tester.sh is running..." > ${LOGFILE}
+ echo "Script -> restore-tester.sh is running..." >> ${LOGFILE}
}
finish()
=== modified file 'drivers/sony-tester.sh'
--- a/drivers/sony-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/sony-tester.sh 2009-02-27 18:32:22 +0000
@@ -69,7 +69,7 @@ SLAP_ARGS=" -h ${MASTER} -P ${MASTER_POR
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"
+OPS_TIMER="${OPS_TIMER} --testName=SONY"
#---------------------
# Script Functions
@@ -183,9 +183,9 @@ drop_db()
header()
{
- print_date
echo "sony-reg-tester.sh"
echo "Script -> sony-reg-tester.sh..." > ${LOGFILE}
+ print_date
echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
}
=== modified file 'drivers/sysbench-oltp-tester.sh'
--- a/drivers/sysbench-oltp-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/sysbench-oltp-tester.sh 2009-02-27 18:32:22 +0000
@@ -76,15 +76,15 @@ echo ""
###########################
# Run Tests
###########################
-echo $LINE >> $LOGFILE
+echo $LINE > $LOGFILE
echo "Script -> Configuration file has been loaded..." >> $LOGFILE
-echo "Script -> sysbench-oltp-tester.sh is running..." > $LOGFILE
+echo "Script -> sysbench-oltp-tester.sh is running..." >> $LOGFILE
echo $LINE >> $LOGFILE
date >> $LOGFILE
if [ ! "${UPDATE_BM_DATABASE}" ] || [ ! "${DO_REV_FILE}" ];then
- echo "Script -> Not set to do BM DB update, exiting..." > $LOGFILE
+ echo "Script -> Not set to do BM DB update, exiting..." >> $LOGFILE
echo $LINE >> $LOGFILE
echo "NDBT_ProgramExit: FAILED"
exit 1
@@ -96,7 +96,7 @@ if [ -f $PK_LOG ];then
rm $PK_LOG
fi
$INIT_RDB
-RC = $?
+RC=${?}
if [ ${RC} != 0 ]; then
echo $LINE >> $LOGFILE
echo "NDBT_ProgramExit: FAILED"
@@ -114,7 +114,7 @@ export PYTHON_EGG_CACHE=/tmp
eval $DB_DRIVER $ARGS >>$LOGFILE
echo $LINE >> $LOGFILE
-echo "Script -> sysbench-oltp-tester.sh is completed..." > $LOGFILE
+echo "Script -> sysbench-oltp-tester.sh is completed..." >> $LOGFILE
echo $LINE >> $LOGFILE
date >> $LOGFILE
echo $LINE >> $LOGFILE
=== added file 'drivers/tpcb-dd-tester.sh'
--- a/drivers/tpcb-dd-tester.sh 1970-01-01 00:00:00 +0000
+++ b/drivers/tpcb-dd-tester.sh 2009-02-27 18:32:22 +0000
@@ -0,0 +1,236 @@
+#!/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
+#------------------------------------------------------------------------------
+
+PWD=`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
+ failed_c
+fi
+
+#---------------
+# Set Variables
+#---------------
+
+LOGFILE=${TESTCASE_LOG_DIR}/tpcb-dd.log
+CSVFILE=${TESTCASE_LOG_DIR}/tpcb-dd.csv
+RESULTSFILE=${TESTCASE_LOG_DIR}/tpcb-dd.rpt
+PKFILE=${TESTCASE_LOG_DIR}/tpcb-dd.pk
+INFOFILE=${TESTCASE_LOG_DIR}/tpcb-dd.info
+PERF_REPORT=${TESTCASE_LOG_DIR}/tpcb-dd-performance.rpt
+TEST_TIME=300
+NUM_TEST_LOOPS=6
+TEST_MODIFY=4
+NUM_ACCT=200000
+TPCB_DIR=${TEST_SCRIPTS_DIR}/tpcb
+DROP_DB=${TPCB_DIR}/dbCleanup.sql
+LINE="==========================================="
+LFG="TPCB_LFG"
+TSNAME="TPCB_TS"
+NUMLFG=3
+LFGSIZE="300M"
+NUMTS=20
+TSSIZE="100M"
+ENGINE="ndbdd"
+DB="TPCB_DD"
+
+
+LOAD_TPCB="${PERL} ${TPCB_DIR}/tpcb_load_db.pl"
+LOAD_TPCB="${LOAD_TPCB} --port=${MASTER_PORT} --host=${MASTER} --log=${LOGFILE}"
+LOAD_TPCB="${LOAD_TPCB} -numA ${NUM_ACCOUNT} -lfgN ${LFG} -tsN ${TSNAME}"
+LOAD_TPCB="${LOAD_TPCB} -numLFG ${NUMLFG} --lfgSize=${LFGSIZE} --tsSize=${TSSIZE}"
+LOAD_TPCB="${LOAD_TPCB} -eng ${ENGINE} --numTS ${NUMTS} --database=${DB}"
+
+TPCB_DRIVER="${PERL} ${TPCB_DIR}/tpcbSql_driver.pl"
+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}"
+TPCB_DRIVER="${TPCB_DRIVER} -nt ${NUM_TEST_LOOPS} -tm ${TEST_MODIFY}"
+TPCB_DRIVER="${TPCB_DRIVER} --database=${DB}"
+
+VERIFY="${PERL} ${SLAVE_VERIFICATION} -mho ${MASTER} -mpo ${MASTER_PORT} -vD ${DB}"
+VERIFY="${VERIFY} -log ${LOGFILE} --test=tpc-b-dd -rdd --dropOnly --num=${NUMTS}"
+VERIFY="${VERIFY} -tsN ${TSNAME} -lfgN ${LFG}"
+
+INIT_RDB="${INIT_RDB} -testN TPC-B-DD -pk ${PKFILE} -l ${LOGFILE}"
+INIT_RDB="${INIT_RDB} -testP test/tpcb -testS tpcb-dd-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}"
+
+OPS_TIMER="${OPS_TIMER} --testName=TPC-B-DD"
+
+#------------------
+# Script Functions
+#-----------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+end_time()
+{
+ ENDTIME=`date +'%F %T'`
+ echo "end->${ENDTIME}" >> ${INFOFILE}
+}
+
+failed()
+{
+ print_date
+ echo ${FAILURE} >> ${LOGFILE}
+ echo "exit->1" >> ${INFOFILE}
+ end_time
+ update_bm
+ remove_data
+ echo ${FAILURE}
+ exit 1
+}
+
+remove_data()
+{
+ line
+ echo "Script -> Dropping TPCB database.." >> $LOGFILE
+ ${OPS_TIMER} --testOp="DROP DB"
+ ${VERIFY} >> ${LOGFILE} 2>&1
+ RC=${?}
+ ${OPS_TIMER} --end
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> verified failed!!!" >> $LOGFILE
+ fi
+}
+
+load_database()
+{
+ line
+ echo "Script -> Calling Load TPCB.." >> ${LOGFILE}
+ ${OPS_TIMER} --testOp="CREATE/LOAD DB"
+ ${LOAD_TPCB} >> ${LOGFILE}
+ RC=${?}
+ ${OPS_TIMER} --end
+ if [ ${RC} -ne 0 ]; then
+ remove_data
+ failed
+ fi
+}
+
+run_test()
+{
+ line
+ echo "Script -> Calling TPCB DD 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()
+{
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
+ print_date
+ echo "Script -> tpcb-dd-tester.sh is running..."
+ echo "Script -> tpcb-dd-tester.sh is running..." >> ${LOGFILE}
+}
+
+update_info()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo "name->TPC-B-DD" >> ${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}
+ fi
+}
+
+update_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ ${UPDATE_RDB}
+ fi
+}
+
+results_rpt()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ ${RESULTS_REPORT}
+ fi
+}
+
+finish()
+{
+ print_date
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+}
+
+#-------------
+# Run Test
+#-------------
+
+header
+update_info
+load_database
+run_test
+end_time
+update_bm
+remove_data
+results_rpt
+finish
+
+#--------------
+# End of script
+#--------------
=== modified file 'drivers/tpcb-tester.sh'
--- a/drivers/tpcb-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/tpcb-tester.sh 2009-02-27 18:32:22 +0000
@@ -99,13 +99,11 @@ 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
+ update_bm
remove_data
+ echo ${FAILURE}
exit 1
}
=== modified file 'drivers/tpcc-dd-rep-tester.sh'
--- a/drivers/tpcc-dd-rep-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/tpcc-dd-rep-tester.sh 2009-02-27 18:32:22 +0000
@@ -102,7 +102,7 @@ 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} -log ${LOGFILE} --test=tpcc-dd -f ${TESTCASE_LOG_DIR} -rdd"
VERIFY="${VERIFY} --num=${NUMDATAFILE}"
DROP_ONLY="${VERIFY} --dropOnly"
VERIFY="${VERIFY} --verifyDrop"
@@ -171,7 +171,7 @@ create_disk_data()
failed
fi
${OPS_TIMER} --end
- ${DATA_DONE}=1
+ DATA_DONE=1
}
load_database()
@@ -260,7 +260,7 @@ verify_slave()
{
line
echo "Script -> Verifing that slave is in sysnc.." >> ${LOGFILE}
- ${OPS_TIMER} --testOp="Verify Slave, DROP DD"
+ ${OPS_TIMER} --testOp="Verify Slave"
${VERIFY} --tables="item warehouse stock district customer new_order"
RC=${?}
if [ ${RC} -eq 0 ]; then
=== modified file 'drivers/tpcc-dd-tester.sh'
--- a/drivers/tpcc-dd-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/tpcc-dd-tester.sh 2009-02-27 18:32:22 +0000
@@ -54,6 +54,8 @@ LINE="==================================
UNDOFILESIZE=1024M
NUMDATAFILE=20
DATAFILESIZE="100M"
+LFG=TPCC_LFG
+TABLESPACE=TPCC_TS
DD_DONE=0
#Create data to load into dbt2
@@ -64,12 +66,14 @@ CREATE_DD="${CREATE_DISK_DATA} --mysql-p
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}"
+CREATE_DD="${CREATE_DD} --logfile-group ${LFG}"
+CREATE_DD="${CREATE_DD} --tablespace ${TABLESPACE}"
#Load dbt2 database
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="${LOAD} --use-disk-cluster -ts ${TABLESPACE}"
#Load Stored Procedures
LOAD_SP="${TPCC_DIR}/mysql_load_sp.sh --host ${MASTER} --port ${MASTER_PORT}"
@@ -91,7 +95,8 @@ DRIVER="${DRIVER} --test-path ${TPCC_DIR
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 --num=${NUMDATAFILE}"
+VERIFY="${VERIFY} -log ${LOGFILE} --test=tpcc_dd -rdd --dropOnly --num=${NUMDATAFILE}"
+VERIFY="${VERIFY} -tsN ${TABLESPACE} -lfgN ${LFG}"
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"
@@ -129,9 +134,7 @@ failed()
remove_data
echo "exit->1" >> ${INFO_FILE}
end_time
- if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- ${UPDATE_RDB}
- fi
+ update_bm_db
echo ${FAILURE}
exit 1
}
@@ -140,11 +143,11 @@ end_time()
{
ENDTIME=`date +'%F %T'`
echo "end->${ENDTIME}" >> ${INFO_FILE}
- echo "exit->0" >> ${INFO_FILE}
}
create_data()
{
+ line
echo "Script -> Creating DBT2 Data for load.." >> ${LOGFILE}
${TPCC_DATAGEN} >>${LOGFILE}
}
@@ -162,7 +165,7 @@ create_disk_data()
failed
fi
${OPS_TIMER} --end
- ${DD_DONE}=1
+ DD_DONE=1
}
load_database()
@@ -220,6 +223,7 @@ run_test()
echo "Script -> TPCC DD run failed!!!!!" >> ${LOGFILE}
failed
fi
+ echo "exit->0" >> ${INFO_FILE}
}
drop_disk_data()
@@ -237,6 +241,7 @@ drop_disk_data()
update_bm_db()
{
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
echo ${UPDATE_RDB} >> ${LOGFILE}
${UPDATE_RDB}
fi
@@ -245,6 +250,7 @@ update_bm_db()
do_results_report()
{
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
echo ${RESULTS_REPORT} >> ${LOGFILE}
${RESULTS_REPORT}
fi
@@ -276,10 +282,10 @@ finish()
header()
{
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
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}
+ echo "Script -> tpcc-dd-tester.sh is running..." >> ${LOGFILE}
}
#-----------
=== modified file 'drivers/tpcc-tester.sh'
--- a/drivers/tpcc-tester.sh 2009-02-13 21:08:34 +0000
+++ b/drivers/tpcc-tester.sh 2009-02-27 18:32:22 +0000
@@ -121,9 +121,7 @@ failed()
print_date
echo "exit->1" >> ${INFO_FILE}
end_time
- if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
- ${UPDATE_RDB}
- fi
+ update_bm
echo $FAILURE
exit 1
}
@@ -184,6 +182,7 @@ run()
echo "Script -> TPCC run failed!!!!!" >> $LOGFILE
failed
fi
+ echo "exit->0" >> ${INFO_FILE}
}
clean()
@@ -197,10 +196,10 @@ clean()
header()
{
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
print_date
- echo "Script -> Configuration file has been loaded..." >> ${LOGFILE}
echo "Script -> tpcc-tester.sh..."
- echo "Script -> tpcc-tester.sh is running..." > ${LOGFILE}
+ echo "Script -> tpcc-tester.sh is running..." >> ${LOGFILE}
}
finish()
@@ -232,7 +231,6 @@ update_bm()
if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
line
echo ${UPDATE_RDB} >> ${LOGFILE}
- echo "exit->0" >> ${INFO_FILE}
${UPDATE_RDB}
fi
}
=== modified file 'scripts/boot.sh'
--- a/scripts/boot.sh 2009-02-13 21:08:34 +0000
+++ b/scripts/boot.sh 2009-02-27 18:32:22 +0000
@@ -151,14 +151,14 @@ create_lock()
###########################
#If any errors we trap them
###########################
-set_trap()
+boot_cleaner()
{
- if [ `uname -s` != "SunOS" ]; then
- CLEAN_UP="${CLEANER} --boot-failed --dist-dir=${DST_PLACE}"
- CLEAN_UP="${CLEAN_UP} --clone=${CLONE} --conf=${CONF}"
- CLEAN_UP="${CLEAN_UP} --run=${RUN}"
- trap "${CLEAN_UP}" ERR
- fi
+ CLEAN_UP="${CLEANER} --boot-failed --dist-dir=${DST_PLACE}"
+ CLEAN_UP="${CLEAN_UP} --clone=${CLONE} --conf=${CONF}"
+ CLEAN_UP="${CLEAN_UP} --run=${RUN}"
+ ${CLEAN_UP}
+ echo "boot.sh error detected!!!!"
+ exit 1
}
#####################################
@@ -217,6 +217,11 @@ create_rev_file()
##################################
build()
{
+ if [ `uname -s` != "SunOS" ]; then
+ trap - ERR
+ trap boot_cleaner ERR
+ fi
+
if [ -n "${INSTALL_DIR}" ];then
if [ -d "${INSTALL_DIR}" ];then
rm -rf ${INSTALL_DIR}
@@ -322,7 +327,11 @@ run()
export_vars
set_clone
create_lock
- set_trap
+
+ if [ `uname -s` != "SunOS" ]; then
+ trap - ERR
+ trap boot_cleaner ERR
+ fi
if [ "${DO_CLONE}" ];then
clones
=== modified file 'scripts/cleanup.sh'
--- a/scripts/cleanup.sh 2009-02-13 21:08:34 +0000
+++ b/scripts/cleanup.sh 2009-02-27 18:32:22 +0000
@@ -162,6 +162,9 @@ logs_reports()
{
### Create test information file
+ if [ ! -d ${RES_DIR} ];then
+ mkdir ${RES_DIR}
+ fi
echo "date=${SAVE_DATE2}" > ${INFO_FILE}
echo "suite=${RUN}" >> ${INFO_FILE}
echo "clone=${CLONE}" >> ${INFO_FILE}
=== modified file 'scripts/run_test.sh'
--- a/scripts/run_test.sh 2009-02-13 21:08:34 +0000
+++ b/scripts/run_test.sh 2009-02-27 18:32:22 +0000
@@ -325,6 +325,12 @@ done
fi
echo "res_dir:${RES_DIR}" >> ${CLONE_REVISION_LOG}
}
+add_ops_times()
+{
+ if [ -e "${TIMER_LOG}" ];then
+ $TEST_TOOLS_DIR/add_ops.sh ${CONF}
+ fi
+}
#############################################################
### MAIN ###
@@ -380,6 +386,7 @@ done
cp $SAVE_OUT_LOG $ATRT_DIR
test_files
run_atrt_tests
+ add_ops_times
cleanup
exit 0
=== modified file 'tests/benchmark/sysbench-0.4.8/Makefile'
--- a/tests/benchmark/sysbench-0.4.8/Makefile 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/config.log 2009-02-27 18:32:22 +0000
@@ -30,7 +30,6 @@ hostinfo = unknown
PATH: /data0/cr_autotest/bin
PATH: /usr/local/bin
PATH: /usr/local/bin
-PATH: /usr/local/bin
PATH: /usr/kerberos/bin
PATH: /usr/local/bin
PATH: /bin
@@ -748,7 +747,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/ccSzs4VP.o: In function `main':
+/tmp/ccIKYh3B.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 +797,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/ccO8jjs2.o: In function `main':
+/tmp/ccso6wxO.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 +847,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/ccmdsIfo.o: In function `main':
+/tmp/ccCbCNT9.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 +977,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 -lrt -lcrypt -lnsl -lm
+configure:21022: result: -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 +1744,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/ccgWZ4Wk.o: In function `main':
+/tmp/cc8WF7Ji.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 +1905,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/ccQvaesZ.o: In function `main':
+/tmp/ccaK4dOB.o: In function `main':
/space/cluster_rep_auto/tests/benchmark/sysbench-0.4.8/conftest.c:104: undefined reference to `thr_setconcurrency'
-/tmp/ccQvaesZ.o:(.data+0x0): undefined reference to `thr_setconcurrency'
+/tmp/ccaK4dOB.o:(.data+0x0): undefined reference to `thr_setconcurrency'
collect2: ld returned 1 exit status
configure:24160: $? = 1
configure: failed program was:
@@ -2263,7 +2262,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 -lrt -lcrypt -lnsl -lm'
+MYSQL_LIBS='-rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/config.status 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm,;t t
+s,@MYSQL_LIBS@,-rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/doc/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/scripts/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/drivers/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/drivers/mysql/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/drivers/oracle/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/drivers/pgsql/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/cpu/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/fileio/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/memory/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/mutex/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/oltp/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -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 2009-02-13 21:08:34 +0000
+++ b/tests/benchmark/sysbench-0.4.8/sysbench/tests/threads/Makefile 2009-02-27 18:32:22 +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 -lrt -lcrypt -lnsl -lm
+MYSQL_LIBS = -rdynamic -L/data0/cr_autotest/lib/mysql -lmysqlclient_r -lz -lcrypt -lnsl -lm
OBJEXT = o
ORA_CFLAGS =
ORA_LIBS =
=== added file 'tests/cge/sql/sc/dbCleanupDATA1.sql'
--- a/tests/cge/sql/sc/dbCleanupDATA1.sql 1970-01-01 00:00:00 +0000
+++ b/tests/cge/sql/sc/dbCleanupDATA1.sql 2009-02-27 18:32:22 +0000
@@ -0,0 +1,2 @@
+ALTER TABLESPACE ts_1 DROP DATAFILE "data_1.dat" ENGINE=NDB;
+
=== added file 'tests/cge/sql/sc/dbCleanupDATA2.sql'
--- a/tests/cge/sql/sc/dbCleanupDATA2.sql 1970-01-01 00:00:00 +0000
+++ b/tests/cge/sql/sc/dbCleanupDATA2.sql 2009-02-27 18:32:22 +0000
@@ -0,0 +1,2 @@
+ALTER TABLESPACE ts_1 DROP DATAFILE "data_2.dat" ENGINE=NDB;
+
=== added file 'tests/cge/sql/sc/dbCleanupDB.sql'
--- a/tests/cge/sql/sc/dbCleanupDB.sql 1970-01-01 00:00:00 +0000
+++ b/tests/cge/sql/sc/dbCleanupDB.sql 2009-02-27 18:32:22 +0000
@@ -0,0 +1,2 @@
+DROP DATABASE sc;
+
=== added file 'tests/cge/sql/sc/dbCleanupLFG.sql'
--- a/tests/cge/sql/sc/dbCleanupLFG.sql 1970-01-01 00:00:00 +0000
+++ b/tests/cge/sql/sc/dbCleanupLFG.sql 2009-02-27 18:32:22 +0000
@@ -0,0 +1,2 @@
+DROP LOGFILE GROUP lg_1 ENGINE=NDB;
+
=== added file 'tests/cge/sql/sc/dbCleanupTS.sql'
--- a/tests/cge/sql/sc/dbCleanupTS.sql 1970-01-01 00:00:00 +0000
+++ b/tests/cge/sql/sc/dbCleanupTS.sql 2009-02-27 18:32:22 +0000
@@ -0,0 +1,2 @@
+DROP TABLESPACE ts_1 ENGINE=NDB;
+
=== modified file 'tests/insert_delete/load_and_delete.pl'
--- a/tests/insert_delete/load_and_delete.pl 2009-02-13 21:08:34 +0000
+++ b/tests/insert_delete/load_and_delete.pl 2009-02-27 18:32:22 +0000
@@ -308,6 +308,7 @@ sub DisconnectFromDatabase ()
#-------------------------------------------------
sub DropDB()
{
+ LogMessage("INSERT/DELETE -> Attempt DROP DB $database on $host");
$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
=== modified file 'tests/joinAtomics/src/JoinsTest'
Binary files a/tests/joinAtomics/src/JoinsTest 2009-02-13 21:08:34 +0000 and b/tests/joinAtomics/src/JoinsTest 2009-02-27 18:32:22 +0000 differ
=== modified file 'tests/ndbatomics/src/NDBAtomics'
Binary files a/tests/ndbatomics/src/NDBAtomics 2009-02-13 21:08:34 +0000 and b/tests/ndbatomics/src/NDBAtomics 2009-02-27 18:32:22 +0000 differ
=== modified file 'tests/tpcb/tpcbSql'
Binary files a/tests/tpcb/tpcbSql 2009-02-13 21:08:34 +0000 and b/tests/tpcb/tpcbSql 2009-02-27 18:32:22 +0000 differ
=== modified file 'tests/tpcb/tpcbSql_driver.pl'
--- a/tests/tpcb/tpcbSql_driver.pl 2008-12-15 22:13:26 +0000
+++ b/tests/tpcb/tpcbSql_driver.pl 2009-02-27 18:32:22 +0000
@@ -40,7 +40,7 @@ our $our_port='15001';
our $our_port2='';
our $our_user='root';
our $our_pass='';
-our $our_database='TPCB';
+our $database='TPCB';
our $our_sockPath='/tmp/mysql.sock';
our $our_sockPath2='';
@@ -288,7 +288,7 @@ sub ShowVars ()
print "Use 2 Socket To Connect .. TRUE\n" if ($our_useSock2);
print "Use 2 Socket To Connect .. FALSE\n" if (!$our_useSock2);
print "Socket 2 Path ............ $our_sockPath2\n" if ($our_useSock2);
- print "Database ................. $our_database\n";
+ print "Database ................. $database\n";
print "Testing Time ............. $testingTime\n";
print "Number of loops .......... $numberOfTests\n";
print "Test Multiplier .......... $testMultiplier\n";
@@ -319,7 +319,7 @@ sub CollectCommandPromptInfo ()
"socp2:s"=>\$our_sockPath2,
"pass:s"=>\$our_pass,
"sql"=>\$sql,
- "database:s"=>\$our_database,
+ "database:s"=>\$database,
"stress"=>\$stress,
"tt:i"=>\$testingTime,
"nt:i"=>\$numberOfTests,
@@ -353,12 +353,12 @@ sub CollectCommandPromptInfo ()
sub ConnectToDatabases ()
{
if (!$our_useSock){
- $dbhM = DBI->connect("dbi:mysql:database=$our_database;host=$our_host;port=$our_port",
+ $dbhM = DBI->connect("dbi:mysql:database=$database;host=$our_host;port=$our_port",
"$our_user", "$our_pass",{RaiseError => 0,PrintError =>0})
or Failure("Can't connect to $our_host MySQLD! Error: $DBI::errstr\n");
}
if ($our_useSock){
- $dbhM = DBI->connect("DBI:mysql:database=$our_database;host=$our_host",
+ $dbhM = DBI->connect("DBI:mysql:database=$database;host=$our_host",
"$our_user", "$our_pass", {RaiseError => 0,PrintError =>0})
or Failure("Can't connect to $our_host MySQLD! Error: $DBI::errstr\n");
}
@@ -412,7 +412,7 @@ sub CreateCommandLine ()
$tpcb = "$workDir/tpcbSql"
}
- $tpcb = "$tpcb --host $our_host --user $our_user --database $our_database";
+ $tpcb = "$tpcb --host $our_host --user $our_user --database $database";
$tpcb = "$tpcb --results $logFilesPath";
if ($our_pass ne '')
@@ -446,7 +446,7 @@ sub CreateCommandLine ()
$tpcb2 = "$workDir/tpcbiSql"
}
- $tpcb2 = "$tpcb2 --host $our_host --user $our_user --database $our_database";
+ $tpcb2 = "$tpcb2 --host $our_host --user $our_user --database $database";
$tpcb2 = "$tpcb2 --results $logFilesPath";
if ($our_pass ne '')
@@ -546,7 +546,7 @@ sub PrepStatements ()
$sthInsMstrSync = $dbhM->prepare("INSERT INTO sync VALUES('$our_host',
$numberOfTests,$testMultiplier,
'$type','$our_user','$our_pass',
- '$our_database',$our_useSock,
+ '$database',$our_useSock,
'$our_sockPath','$our_sockPath2',
'$our_port','$our_port2',
$stress,$sql,'setup',
@@ -634,7 +634,7 @@ sub SoloRunTest ()
system("touch $stopFile");
sleep(10);
ConnectToDatabases();
- $sthSumResults ->execute()
+ $sthSumResults->execute()
or Failure("Select sum from trans execute failed\n");
$sthSumResults->bind_col (1, \$tps);
$sthSumResults->fetch;
@@ -648,11 +648,12 @@ sub SoloRunTest ()
DisconnectFromDatabase();
print $fh "-----------------------------------\n";
#/Each TPCB creates a log of the run, we need to save this
- $dir="$our_host"."_TPCB_"."$loop";
+ $dir="$our_host"."_"."$database"."_"."$loop";
my $newDir="$logFilesPath/$dir/";
if(-e "$newDir"){system("rm -rf $newDir");}
system("mkdir $newDir");
system("mv $logFilesPath/*.txt $newDir");
+ system("mv $logFilesPath/*.err $newDir");
$loop++;
}
}
@@ -745,9 +746,10 @@ sub MasterRunTest ()
print $cvs_fh "$tmp_hold,$tps\n";
print $fh "-----------------------------------\n";
CleanDatabase();
- $dir="$our_host"."_TPCB_"."$loop";
+ $dir="$our_host"."_"."$database"."_"."$loop";
system("mkdir $logFilesPath\$dir");
system("mv *.txt $logFilesPath\$dir");
+ system("mv *.err $logFilesPath\$dir");
$loop++;
}
DisconnectFromDatabase();
@@ -837,9 +839,10 @@ sub SlaveRunTest ()
$sthSlaveCheckSetup->bind_col (1, \$masterSetup);
$sthSlaveCheckSetup->fetch;
}
- $dir="$our_host"."_TPCB_"."$loop";
+ $dir="$our_host"."_"."$database"."_"."$loop";
system("mkdir $logFilesPath\$dir");
system("mv *.txt $logFilesPath\$dir");
+ system("mv *.err $logFilesPath\$dir");
$loop++;
}
DisconnectFromDatabase();
@@ -859,7 +862,7 @@ sub SetSlaveVars ()
$sthSlaveSetup->bind_col (2,\$testMultiplier);
$sthSlaveSetup->bind_col (3,\$our_user);
$sthSlaveSetup->bind_col (4,\$our_pass);
- $sthSlaveSetup->bind_col (5,\$our_database);
+ $sthSlaveSetup->bind_col (5,\$database);
$sthSlaveSetup->bind_col (6,\$our_useSock);
$sthSlaveSetup->bind_col (7,\$our_sockPath);
$sthSlaveSetup->bind_col (8,\$our_sockPath2);
=== modified file 'tests/tpcb/tpcbSql_src/src/support.h'
--- a/tests/tpcb/tpcbSql_src/src/support.h 2008-10-29 21:41:06 +0000
+++ b/tests/tpcb/tpcbSql_src/src/support.h 2009-02-27 18:32:22 +0000
@@ -2,7 +2,8 @@
//////////////////////////////////////////////////////////////////////
// Supplies support functions to test application
//////////////////////////////////////////////////////////////////////
-
+#ifndef _support_h_included_
+#define _support_h_included_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
@@ -74,4 +75,5 @@ private:
bool verbose;
};
+#endif
=== modified file 'tests/tpcb/tpcbSql_src/src/tpcb.cpp'
--- a/tests/tpcb/tpcbSql_src/src/tpcb.cpp 2009-02-13 21:08:34 +0000
+++ b/tests/tpcb/tpcbSql_src/src/tpcb.cpp 2009-02-27 18:32:22 +0000
@@ -14,8 +14,11 @@ tpcb::tpcb(const char* m_system,
int m_sqlOrSp,
bool m_stress,
bool m_tra,
- const char *m_script)
+ const char *m_script,
+ const char *m_errorLog)
{
+ support supportObj(m_errorLog);
+ m_pSupObj = &supportObj;
transactional = m_tra;
port = m_portIn;
stress = m_stress;
@@ -695,15 +698,19 @@ void tpcb::PrintError(const char *m_msg)
if (mysql->server_version)
{
fprintf(stdout, "\n [MySQL-%s]", mysql->server_version);
+ m_pSupObj->PrintMessage("[MySQL-%s]", mysql->server_version);
}
else
{
fprintf(stdout, "\n [MySQL]");
+ m_pSupObj->PrintMessage("[MySQL]");
}
fprintf(stdout, "[%d] %s\n", mysql_errno(mysql), mysql_error(mysql));
+ m_pSupObj->PrintMessage("mysql_errno(mysql)", mysql_error(mysql));
}
else if (m_msg)
fprintf(stderr, " [MySQL] %s\n", m_msg);
+ m_pSupObj->PrintMessage("[MySQL]", m_msg);
}
void tpcb::PrintStError(MYSQL_STMT *m_stmt, const char *m_msg)
@@ -713,16 +720,19 @@ void tpcb::PrintStError(MYSQL_STMT *m_st
if (m_stmt->mysql && m_stmt->mysql->server_version)
{
fprintf(stdout, "\n [MySQL-%s]", m_stmt->mysql->server_version);
+ m_pSupObj->PrintMessage("[MySQL-%s]", mysql->server_version);
}
else
{
fprintf(stdout, "\n [MySQL]");
+ m_pSupObj->PrintMessage("[MySQL]");
}
- fprintf(stdout, "[%d] %s\n", mysql_stmt_errno(m_stmt),
- mysql_stmt_error(m_stmt));
+ fprintf(stdout, "[%d] %s\n", mysql_stmt_errno(m_stmt),mysql_stmt_error(m_stmt));
+ m_pSupObj->PrintMessage("Statement Error", mysql_stmt_error(m_stmt));
}
else if (m_msg)
fprintf(stderr, " [MySQL] %s\n", m_msg);
+ m_pSupObj->PrintMessage("[MySQL]", m_msg);
}
//////////////////////////////////////////////////////////////////////
// Abort test application
@@ -730,6 +740,9 @@ void tpcb::PrintStError(MYSQL_STMT *m_st
void tpcb::Die(const char *m_file, int m_line, const char *m_expr)
{
fprintf(stderr, "%s:%d: check failed: '%s'\n", m_file, m_line, m_expr);
+ m_pSupObj->PrintMessage("check failed:");
+ m_pSupObj->PrintMessage(m_file, m_line);
+ m_pSupObj->PrintMessage(m_expr);
abort();
}
=== modified file 'tests/tpcb/tpcbSql_src/src/tpcb.h'
--- a/tests/tpcb/tpcbSql_src/src/tpcb.h 2008-10-29 21:41:06 +0000
+++ b/tests/tpcb/tpcbSql_src/src/tpcb.h 2009-02-27 18:32:22 +0000
@@ -14,6 +14,7 @@
#include "rand.h"
#include <stdlib.h>
#include <time.h>
+#include "support.h"
// Define statments
static char Select_Accounts_stm[] =
@@ -147,7 +148,8 @@ public:
int m_sqlOrSp,
bool m_stress,
bool m_tra,
- const char* m_script);
+ const char* m_script,
+ const char* m_errorLog);
~tpcb();
//Public Class Functions
@@ -172,6 +174,7 @@ private:
bool stress;
time_t startTime;
time_t curTime;
+ support * m_pSupObj;
//Connect variables
char host[256]; // Computer to connect to
=== modified file 'tests/tpcb/tpcbSql_src/src/tpcbSql.cpp'
--- a/tests/tpcb/tpcbSql_src/src/tpcbSql.cpp 2008-10-29 21:41:06 +0000
+++ b/tests/tpcb/tpcbSql_src/src/tpcbSql.cpp 2009-02-27 18:32:22 +0000
@@ -51,6 +51,7 @@ int main(int argc, char * argv[])
char stopFile[256] = "tpcb.stop";
#endif
char fullResultsFile[256];
+ char errorLog[256];
char id[10] = "TPCB";
bool scriptIDgiven = false;
@@ -183,10 +184,14 @@ int main(int argc, char * argv[])
//---------------------------------------------------------------------
strcpy(fullResultsFile,rFilePath);
+ strcpy(errorLog,rFilePath);
strcat(fullResultsFile,id);
+ strcat(errorLog,id);
strcat(fullResultsFile,".txt");
+ strcat(errorLog,".err");
- tpcb tpcbObj(host, db, user, pass, port, sqlOrSp, stress, transactional, id);
+ tpcb tpcbObj(host, db, user, pass, port, sqlOrSp, stress,
+ transactional, id, errorLog);
support supportObj(fullResultsFile);
pTpcbObj = &tpcbObj;
=== modified file 'tests/tpcb/tpcb_load_db.pl'
--- a/tests/tpcb/tpcb_load_db.pl 2008-10-30 23:41:52 +0000
+++ b/tests/tpcb/tpcb_load_db.pl 2009-02-27 18:32:22 +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='TPCB';
+our $host='localhost';
+our $port='3306';
+our $user='root';
+our $pass='';
+our $database='TPCB';
our $dbhM='';
our $aid=0;
our $bid=0;
@@ -44,18 +44,21 @@ our $accounts=100000; #/should be change
our $branches=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 $engine_type='NDB';
+our $lfg_name='lg1';
+our $lfgSize="250M";
+our $lfgUndoBufSize="100M";
+our $ts_name='ts1';
+our $tsSize="500M";
+our $diskData=0;
+our $mixData=0;
+our $num_undo=1;
+our $skipLFG=0;
+our $num_data=2;
+our $cfiles=0;
+our $loadFromFiles=0;
+our $sockPath='/tmp/mysql.sock';
+our $useSock=0;
our $logFile='./Load_tpcb.log';
our $fh='';
our $failed=1;
@@ -89,7 +92,7 @@ main();
sub main ()
{
CollectCommandPromptInfo();
- if (!$our_cfiles){
+ if (!$cfiles){
ConnectToDatabases();
if (!$sp_only){
CreateDB();
@@ -97,7 +100,7 @@ sub main ()
}
Create_Procedures();
if (!$c_only && !$sp_only){
- if (!$our_loadFromFiles){
+ if (!$loadFromFiles){
Load_Tables();
}
else{
@@ -147,7 +150,7 @@ sub Usage ()
-ce [--createOnly] :creates the database and tables
but loads no data. (default false)
- -lf [--lfgname} :Log File Group Name. (default lg1)
+ -lf [--lfgName} :Log File Group Name. (default lg1)
-numL [--numLFGUndo] :Number of LFG Undo Files. (default 1)
@@ -178,41 +181,41 @@ 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 "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);
+ !$loadFromFiles);
print "Load Data From File ...... 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 ||
+ 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 ||
+ $skipLFG);
+ print "Number LFG Undo File(s)... $num_undo\n" if ($diskData ||
$mixData);
- print "Table Space Name ......... $our_ts_name\n" if ($diskData ||
+ print "Table Space Name ......... $ts_name\n" if ($diskData ||
$mixData);
- print "Number TS Data Files(s)... $our_num_data\n" if ($diskData ||
+ print "Number TS Data Files(s)... $num_data\n" if ($diskData ||
$mixData);
}
@@ -223,44 +226,47 @@ 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,
+ "host:s"=>\$host,
+ "user:s"=>\$user,
+ "port:i"=>\$port,
+ "socket"=>\$useSock,
+ "spath:s"=>\$sockPath,
+ "pass:s"=>\$pass,
+ "engine:s"=>\$engine_type,
+ "database:s"=>\$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,
+ "lfgName:s"=>\$lfg_name,
+ "lfgSize:s"=>\$lfgSize,
+ "lfgUndoBufSize:s"=>$lfgUndoBufSize,
+ "numLFGUndo:i"=>\$num_undo,
+ "skipLFGcreate"=>\$skipLFG,
+ "tsName:s"=>\$ts_name,
+ "tsSize:s"=>\$tsSize,
+ "numTSData:i"=>\$num_data,
"numAcc:i"=>\$accounts,
"installSPonly"=>\$sp_only,
- "loadFromFiles"=>\$our_loadFromFiles,
- "cfiles"=>\$our_cfiles,
+ "loadFromFiles"=>\$loadFromFiles,
+ "cfiles"=>\$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')
+ if ($useSock){$ENV{MYSQL_UNIX_PORT} = $sockPath;}
+ if ($engine_type ne 'ndb' && $engine_type ne 'ndbcluster'
+ && $engine_type ne 'InnoDB' && $engine_type ne 'MyISAM'
+ && $engine_type ne 'innodb' && $engine_type ne 'myisam'
+ && $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;}
$fh = IO::File->new("$logFile", O_WRONLY|O_APPEND)
or die "ERROR: could not open $logFile: $!\n";
print $fh "TPCB_Loader -> CollectCommandPrompt Complete\n";
@@ -272,14 +278,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",{RaiseError => 0,PrintError =>0})
+ 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 Master process!\n");
}
else{
- $dbhM = DBI->connect("DBI:mysql:database=mysql;host=$our_host",
- "$our_user", "$our_pass", {RaiseError => 0,PrintError =>0})
+ $dbhM = DBI->connect("DBI:mysql:database=mysql;host=$host",
+ "$user", "$pass", {RaiseError => 0,PrintError =>0})
or FailedSQL("Can't connect to Master process!");
}
print $fh "TPCB_Loader -> Connected to Master!\n";
@@ -292,7 +298,7 @@ sub DisconnectFromDatabase ()
{
$dbhM->disconnect
or warn " Disconnection failed: $DBI::errstr\n";
- print $fh "TPCP_Loader -> Disconnected from MySQLD on $our_host\n";
+ print $fh "TPCP_Loader -> Disconnected from MySQLD on $host\n";
}
#-------------------------------------------------
@@ -300,44 +306,44 @@ sub DisconnectFromDatabase ()
#-------------------------------------------------
sub CreateDB ()
{
- print $fh "TPCB_Loader -> Creating database $our_database!\n";
- $sth = $dbhM->prepare("DROP DATABASE IF EXISTS $our_database;")
+ print $fh "TPCB_Loader -> Creating database $database!\n";
+ $sth = $dbhM->prepare("DROP DATABASE IF EXISTS $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;")
+ $sth = $dbhM->prepare("CREATE DATABASE $database;")
or FailedSQL("Prepare Create DB error: ");
$sth->execute()
or FailedSQL("Create DB Error: ");
$sth->finish();
- $sth = $dbhM->prepare("USE $our_database;")
+ $sth = $dbhM->prepare("USE $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
+ if($diskData || $mixData && !$skipLFG){
+ print $fh "TPCB_Loader -> Creating LFG $lfg_name....\n";
+ $sth = $dbhM->prepare("CREATE LOGFILE GROUP $lfg_name
+ ADD UNDOFILE 'undofile.dat'
+ INITIAL_SIZE $lfgSize
+ UNDO_BUFFER_SIZE = $lfgUndoBufSize
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;
+ if($num_undo > 1){
+ $undo_count = $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
+ $sth = $dbhM->prepare("ALTER LOGFILE GROUP $lfg_name
+ ADD UNDOFILE '$file'
+ INITIAL_SIZE $lfgSize
ENGINE=NDB;")
or FailedSQL("Prepare ALTER LOGFILE GROUP error: ");
$sth->execute()
@@ -348,25 +354,25 @@ sub CreateDB ()
}
}
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
+ print $fh "TPCB_Loader -> Creating TS $ts_name....\n";
+ $sth = $dbhM->prepare("CREATE TABLESPACE $ts_name
+ ADD DATAFILE 'datafile.dat'
+ USE LOGFILE GROUP $lfg_name
+ INITIAL_SIZE $tsSize
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;
+ if($num_data > 1){
+ $data_count = $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
+ $sth = $dbhM->prepare("ALTER TABLESPACE $ts_name
+ ADD DATAFILE '$file'
+ INITIAL_SIZE $tsSize
ENGINE=NDB;")
or FailedSQL("Prepare ALTER TABLE SPACE error: ");
$sth->execute()
@@ -376,7 +382,7 @@ sub CreateDB ()
}
}
}
- print $fh "TPCB_Loader -> $our_database Created.\n";
+ print $fh "TPCB_Loader -> $database Created.\n";
}
#------------------------------------------------------
@@ -427,7 +433,7 @@ sub Create_Tables ()
balance DECIMAL(8,2),
filler CHAR(80),
PRIMARY KEY (aid))
- ENGINE=$our_engine_type;")
+ ENGINE=$engine_type;")
or FailedSQL("Prepare Create Account Error:");
$sth->execute()
or SQL_ExecuteError("Create Account Table Error:",1);
@@ -439,7 +445,7 @@ sub Create_Tables ()
$sth = $dbhM->prepare("CREATE TABLE branch (bid INT, balance DECIMAL(8,2),
filler CHAR(80),
PRIMARY KEY (bid))
- ENGINE=$our_engine_type;")
+ ENGINE=$engine_type;")
or FailedSQL("Prepare Create Branch Error: ");
$sth->execute()
or FailedSQL("Create Branch Table Error: ");
@@ -450,7 +456,7 @@ sub Create_Tables ()
balance DECIMAL(8,2),
filler CHAR(80),
PRIMARY KEY (tid))
- ENGINE=$our_engine_type;")
+ ENGINE=$engine_type;")
or FailedSQL("Prepare Create Teller Error: ");
$sth->execute()
or FailedSQL("Create Teller Table Error: ");
@@ -462,8 +468,8 @@ sub Create_Tables ()
balance DECIMAL(8,2),
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 FailedSQL("Prepare Create Account DD Error: ");
$sth->execute()
or FailedSQL("Create DD Account Table Error: ");
@@ -473,8 +479,8 @@ sub Create_Tables ()
$sth = $dbhM->prepare("CREATE TABLE branch (bid INT, balance DECIMAL(8,2),
filler CHAR(80),
PRIMARY KEY (bid))
- TABLESPACE $our_ts_name
- STORAGE DISK ENGINE=$our_engine_type;")
+ TABLESPACE $ts_name
+ STORAGE DISK ENGINE=$engine_type;")
or FailedSQL("Prepare Create Branch DD Error: ");
$sth->execute()
or FailedSQL("Create DD Branch Table Error: ");
@@ -485,8 +491,8 @@ sub Create_Tables ()
balance DECIMAL(8,2),
filler CHAR(80),
PRIMARY KEY (tid))
- TABLESPACE $our_ts_name
- STORAGE DISK ENGINE=$our_engine_type;")
+ TABLESPACE $ts_name
+ STORAGE DISK ENGINE=$engine_type;")
or FailedSQL("Prepare Create Teller Error: ");
$sth->execute()
or FailedSQL("Create DD Teller Table Error: ");
@@ -502,7 +508,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 FailedSQL("Prepare Create History Error: ");
$sth->execute()
or FailedSQL("Create History Table Error: ");
@@ -517,8 +523,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 FailedSQL("Prepare Create History DD Error: ");
$sth->execute()
or FailedSQL("Create History DD Table Error: ");
@@ -532,7 +538,7 @@ sub Create_Tables ()
lastTransTime DATETIME,
startTime DATETIME,
PRIMARY KEY (scriptId))
- ENGINE=$our_engine_type;")
+ ENGINE=$engine_type;")
or FailedSQL("Prepare Trans Table Error: ");
$sth->execute()
or FailedSQL("Create Trans Table Error: ");
@@ -544,8 +550,8 @@ sub Create_Tables ()
lastTransTime DATETIME,
startTime DATETIME,
PRIMARY KEY (scriptId))
- TABLESPACE $our_ts_name
- STORAGE DISK ENGINE=$our_engine_type;")
+ TABLESPACE $ts_name
+ STORAGE DISK ENGINE=$engine_type;")
or FailedSQL("Prepare Trans Table Create DD Error: ");
$sth->execute()
or FailedSQL("Create DD Trans Table Error: ");
@@ -585,14 +591,14 @@ sub Create_Tables ()
sub Create_Procedures ()
{
print $fh "TPCB_Loader -> Creating Stored Procedures, please wait...\n";
- $sth = $dbhM->prepare("DROP PROCEDURE IF EXISTS TPCB.ExTrans;")
+ $sth = $dbhM->prepare("DROP PROCEDURE IF EXISTS $database.ExTrans;")
or FailedSQL("Prepare drop ExTrans error: ");
$sth->execute()
or FailedSQL("Drop SP Error: ");
$sth->finish();
$sth = $dbhM->prepare("
- CREATE PROCEDURE TPCB.ExTrans(IN acct INT, IN brch INT,
+ CREATE PROCEDURE $database.ExTrans(IN acct INT, IN brch INT,
IN tell INT, IN amt DECIMAL(10,2))
BEGIN
DECLARE bal DECIMAL(10,2) DEFAULT 0.0;
@@ -600,19 +606,19 @@ sub Create_Procedures ()
DECLARE tbal DECIMAL(10,2) DEFAULT 0.0;
START TRANSACTION;
- SELECT account.balance INTO bal FROM TPCB.account WHERE aid = acct;
- SELECT teller.balance INTO tbal FROM TPCB.teller WHERE tid = tell;
- SELECT branch.balance INTO bbal FROM TPCB.branch WHERE bid = brch;
+ SELECT account.balance INTO bal FROM $database.account WHERE aid = acct;
+ SELECT teller.balance INTO tbal FROM $database.teller WHERE tid = tell;
+ SELECT branch.balance INTO bbal FROM $database.branch WHERE bid = brch;
SET bal = bal + amt;
SET bbal = bbal + amt;
SET tbal = tbal + amt;
- UPDATE TPCB.account SET balance = bal, filler = 'account updated'
+ UPDATE $database.account SET balance = bal, filler = 'account updated'
WHERE aid = acct;
- UPDATE TPCB.branch SET balance = bbal, filler = 'branch updated'
+ UPDATE $database.branch SET balance = bbal, filler = 'branch updated'
WHERE bid = brch;
- UPDATE TPCB.teller SET balance = tbal, filler = 'teller updated'
+ UPDATE $database.teller SET balance = tbal, filler = 'teller updated'
WHERE tid = tell;
COMMIT;
END;")or FailedSQL("Prepare ExTrans error: ");
@@ -621,19 +627,19 @@ sub Create_Procedures ()
or FailedSQL("Create ExTrans Procedure Error: ");
$sth->finish();
- $sth = $dbhM->prepare("DROP PROCEDURE IF EXISTS TPCB.HistInsert;")
+ $sth = $dbhM->prepare("DROP PROCEDURE IF EXISTS $database.HistInsert;")
or FailedSQL("Prepare Drop HistInsert error: ");
$sth->execute()
or FailedSQL("Drop HI SP Error: ");
$sth->finish();
- $sth = $dbhM->prepare("CREATE PROCEDURE TPCB.HistInsert(IN acct INT,
+ $sth = $dbhM->prepare("CREATE PROCEDURE $database.HistInsert(IN acct INT,
IN brch INT,
IN tell INT,
IN sid CHAR(10))
BEGIN
START TRANSACTION;
- INSERT into TPCB.history (aid,tid,bid,TransTime,scriptID,filler)
+ INSERT into $database.history (aid,tid,bid,TransTime,scriptID,filler)
VALUES(acct,tell,brch,now(),sid,'MoreMoney');
COMMIT;
END;") or FailedSQL("Prepare History Insert SP error: ");
@@ -642,18 +648,18 @@ sub Create_Procedures ()
or FailedSQL("Create HI Procedure Error: ");
$sth->finish();
- $sth = $dbhM->prepare("DROP PROCEDURE IF EXISTS TPCB.UpdateTrans;")
+ $sth = $dbhM->prepare("DROP PROCEDURE IF EXISTS $database.UpdateTrans;")
or FailedSQL("Prepare Drop Update Trans error: ");
$sth->execute()
or FailedSQL("Drop Update Trans SP Error: ");
$sth->finish();
- $sth = $dbhM->prepare("CREATE PROCEDURE TPCB.UpdateTrans(IN counter INT,
+ $sth = $dbhM->prepare("CREATE PROCEDURE $database.UpdateTrans(IN counter INT,
IN tps FLOAT,
IN id CHAR(10))
BEGIN
START TRANSACTION;
- UPDATE TPCB.trans set count = counter, lastTransTime = now(),
+ UPDATE $database.trans set count = counter, lastTransTime = now(),
TPS = tps where scriptId = id;
COMMIT;
END;") or FailedSQL("Prepare Update Trans SP error: ");
@@ -671,7 +677,7 @@ sub Load_Tables ()
{
print $fh "TPCB_Loader -> Loading tables\n";
#print "Loading accounts table -- Please wait\n";
- $sth = $dbhM->prepare("INSERT into account VALUES(?, ?, ?, ?);")
+ $sth = $dbhM->prepare("INSERT into $database.account VALUES(?, ?, ?, ?);")
or FailedSQL("Prepare insert into account error: ");
while($bid < $branches){
@@ -692,7 +698,7 @@ sub Load_Tables ()
}
$sth->finish();
- $sth = $dbhM->prepare("INSERT into branch values(?, ?, ?);")
+ $sth = $dbhM->prepare("INSERT into $database.branch values(?, ?, ?);")
or FailedSQL("Prepare insert into account error: ");
$bid = 0;
#print "\nLoading Branch Table ";
@@ -706,7 +712,7 @@ sub Load_Tables ()
}
$sth->finish();
- $sth = $dbhM->prepare("INSERT into teller values(?, ?, ?, ?);")
+ $sth = $dbhM->prepare("INSERT into $database.teller values(?, ?, ?, ?);")
or FailedSQL("Prepare insert into account error: ");
$bid=0;
#print "\nLoading Teller Table ";
@@ -793,7 +799,7 @@ sub LoadFromFiles ()
{
#print "Loading Database from files\n";
- $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;
=== added file 'tools/add_ops.sh'
--- a/tools/add_ops.sh 1970-01-01 00:00:00 +0000
+++ b/tools/add_ops.sh 2009-02-27 18:32:22 +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
+#------------------------------------------------------------------------------
+# Set X is for debugging. Should be commented out for runs or it will cause
+# test failure
+#------------------------------------------------------------------------------
+
+PWD=`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
+ failed_c
+fi
+
+#---------------
+# Set Variables
+#---------------
+
+LOGFILE=${TESTCASE_LOG_DIR}/ops_timer.log
+CSVFILE=${TIMER_LOG}
+PKFILE=${TESTCASE_LOG_DIR}/ops_timer.pk
+INFOFILE=${TESTCASE_LOG_DIR}/ops_timer.info
+REPORT=${TESTCASE_LOG_DIR}/ops_timer.rpt
+LINE="==========================================="
+
+INIT_RDB="${INIT_RDB} -testN OPS-TIMER -pk ${PKFILE} -l ${LOGFILE}"
+INIT_RDB="${INIT_RDB} -testP OPS-TIMER -testS tools/ops-timer.pl"
+
+UPDATE_RDB="${UPDATE_RDB} -pkF ${PKFILE} -res ${CSVFILE} -info ${INFOFILE}"
+UPDATE_RDB="${UPDATE_RDB} -l ${LOGFILE} --ops"
+
+RESULTS_REPORT="${RESULTS_REPORT} -l ${LOGFILE} -i ${INFOFILE} -re ${REPORT}"
+RESULTS_REPORT="${RESULTS_REPORT} --ops"
+
+
+#------------------
+# Script Functions
+#-----------------
+
+line()
+{
+ echo ${LINE} >> ${LOGFILE}
+}
+
+print_date()
+{
+ line
+ date >> ${LOGFILE}
+ line
+}
+
+end_time()
+{
+ ENDTIME=`date +'%F %T'`
+ echo "end->${ENDTIME}" >> ${INFOFILE}
+}
+
+failed()
+{
+ print_date
+ echo ${FAILURE} >> ${LOGFILE}
+ echo ${FAILURE}
+ exit 1
+}
+
+run()
+{
+ line
+ echo "Script -> Calling ops time insert" >> ${LOGFILE}
+ update_info
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> ops timer update_info failed!!!!!" >> ${LOGFILE}
+ print_date
+ failed
+ fi
+ end_time
+ update_bm
+ RC=${?}
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> ops timer update_bm failed!!!!!" >> ${LOGFILE}
+ print_date
+ failed
+ fi
+ echo "exit->0" >> ${INFOFILE}
+ results_rpt
+ if [ ${RC} -ne 0 ]; then
+ echo "Script -> ops timer results_rpt failed!!!!!" >> ${LOGFILE}
+ print_date
+ failed
+ fi
+}
+
+header()
+{
+ echo "Script -> Configuration file has been loaded..." > ${LOGFILE}
+ print_date
+ echo "Script -> ops-timer.sh is running..."
+ echo "Script -> ops-timer.sh is running..." >> ${LOGFILE}
+}
+
+update_info()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ echo "name->OPS-TIMER" >> ${INFOFILE}
+ echo "testType->PERFORMANCE" >> ${INFOFILE}
+ echo "tag->Sec" >> ${INFOFILE}
+ echo "dataType->float" >> ${INFOFILE}
+ echo "description->Seconds to complete OPS" >> ${INFOFILE}
+ STARTTIME=`date +'%F %T'`
+ echo "start->${STARTTIME}" >> ${INFOFILE}
+ line
+ echo ${INIT_RDB} >> ${LOGFILE}
+ ${INIT_RDB}
+ fi
+}
+
+update_bm()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ echo ${UPDATE_RDB} >> ${LOGFILE}
+ ${UPDATE_RDB}
+ fi
+}
+
+results_rpt()
+{
+ if [ "${UPDATE_BM_DATABASE}" ] && [ "${DO_REV_FILE}" ];then
+ line
+ echo ${RESULTS_REPORT} >> ${LOGFILE}
+ ${RESULTS_REPORT}
+ fi
+}
+
+finish()
+{
+ print_date
+ echo "Script -> ops timer insert/update/report complete..." >> ${LOGFILE}
+ echo "NDBT_ProgramExit: OK"
+ exit 0
+}
+
+#-------------
+# Run Test
+#-------------
+
+header
+run
+finish
+
+#--------------
+# End of script
+#--------------
=== modified file 'tools/create_dd.sh'
--- a/tools/create_dd.sh 2008-10-29 21:41:06 +0000
+++ b/tools/create_dd.sh 2009-02-27 18:32:22 +0000
@@ -360,7 +360,7 @@ if [ $NUM_DATA -gt 1 ]; then
while [ $NUM_DATA -gt 0 ]
do
NUM_DATA=`expr $NUM_DATA - 1`
- echo $NUM_DATA
+ #echo $NUM_DATA
if [ $NUM_DATA -gt 0 ]; then
DATAFILE="'$DATAFILENAME$NUM_DATA$DATAFILEEXT'"
ADDDATAFILE="ALTER TABLESPACE $TABLESPACE $ADDFILE"
=== modified file 'tools/resultsDBreport.pl'
--- a/tools/resultsDBreport.pl 2009-02-13 21:08:34 +0000
+++ b/tools/resultsDBreport.pl 2009-02-27 18:32:22 +0000
@@ -48,8 +48,12 @@ our $mailList='./mail.list';
#--- Global Arrays ---#
our @curValArray;
our @curThreadArray;
+our @curOpsTestArray;
+our @curOpsArray;
our @prevValArray;
our @prevThreadArray;
+our @prevOpsTestArray;
+our @prevOpsArray;
our @curHostsArray;
our @curOSArray;
our @curSysConfArray;
@@ -64,6 +68,8 @@ our $prevRev;
our $compareRunStart;
our $prevRunStart;
our $atomics=0;
+our $ops=0;
+our $insDel=0;
#--- Global Utilities Var ---#
our $devationWarning=0;
our $prevRun=1;
@@ -96,6 +102,11 @@ sub GetCurValues();
sub GetPrevValues();
#--- Reporting Sub Functions --#
sub WriteReport();
+sub WriteReportRegular($);
+sub WriteReportAtomics($);
+sub WriteReportOPS($);
+sub WriteReportDI($);
+sub WritePreviousHead($);
sub SendMail();
#--------------------------------------------------
@@ -180,33 +191,59 @@ sub GetCurValues()
}
# ---Select out value(s) and thread(s) from result_data for current ---#
- if (!$failed){
- $sth = $dbhRDB->prepare("SELECT val, tag, threads
- FROM result_data
- WHERE test_results_id IN (SELECT id
- FROM test_results
- WHERE run_log_id = ?);")
+ if (!$failed)
+ {
+ if(!$ops && !$insDel)
+ {
+ $sth = $dbhRDB->prepare("SELECT val, tag, threads
+ FROM result_data
+ WHERE test_results_id IN (SELECT id
+ FROM test_results
+ WHERE run_log_id = ?);")
or die "Prepare SELECT values #1 error: ", $dbhRDB->errstr;
- $sth->bind_param(1, $curID);
- $sth->execute()
- or die "Execute SELECT values #1 error:",$sth->errstr;
- $sth->bind_col (1, \$val);
- $sth->bind_col (2, \$measureTag);
- $sth->bind_col (3, \$threads);
+ $sth->bind_param(1, $curID);
+ $sth->execute()
+ or die "Execute SELECT values #1 error:",$sth->errstr;
+ $sth->bind_col (1, \$val);
+ $sth->bind_col (2, \$measureTag);
+ $sth->bind_col (3, \$threads);
- while ($sth->fetch()){
+ while ($sth->fetch()){
push(@curValArray,$val);
push(@curThreadsArray,$threads);
- }
- $sth->finish();
-
- if ($#curValArray == -1 || $#curThreadsArray == -1){
- $failed = 1;
- }
- if($debug){
+ }
+ $sth->finish();
+ if ($#curValArray == -1 || $#curThreadsArray == -1){$failed = 1;}
+ if($debug)
+ {
print "Current Value(s) Array has $#curValArray records\n";
print "Current thread(s) Array has $#curThreadsArray records\n";
- }
+ }
+ }
+ else
+ {
+ local $tempName;
+ local $tempOp;
+ $sth = $dbhRDB->prepare("SELECT program, val, tag
+ FROM result_data
+ WHERE test_results_id IN (SELECT id
+ FROM test_results
+ WHERE run_log_id = ?);")
+ or die "Prepare SELECT values #1 error: ", $dbhRDB->errstr;
+ $sth->bind_param(1, $curID);
+ $sth->execute()
+ or die "Execute SELECT values #1 error:",$sth->errstr;
+ $sth->bind_col (1, \$tempName);
+ $sth->bind_col (2, \$val);
+ $sth->bind_col (3, \$tempOp);
+
+ while ($sth->fetch()){
+ push(@curOpsTestArray,$tempName);
+ push(@curValArray,$val);
+ push(@curOpsArray,$tempOp);
+ }
+ $sth->finish();
+ }
}
#--- Select main driver host ID ---#
@@ -243,175 +280,229 @@ sub GetCurValues()
}
}
- if (!$failed){
- LogMessage("BMDB Reporter -> Current Data gathering from DB complete");
- }
- else{
- LogMessage("BMDB Reporter -> Current Data gathering from DB Failed!!");
- }
+ if (!$failed){LogMessage("BMDB Reporter -> Current Data gathering from DB complete");}
+ else{LogMessage("BMDB Reporter -> Current Data gathering from DB Failed!!");}
}
#----------------------------------------
# Get Previous runs information if exists
#----------------------------------------
sub GetPrevValues()
{
- #-----------Select out maxID Previous ---#
- local $buildId;
- local $sth = $dbhRDB->prepare("SELECT max(id), max(run_start)
- from run_log
- where name = ?
- and run_start < ?
- and build = ?
- and config_details = ?;")
- or die "Prepare SELECT previous max(id) error: ", $dbhRDB->errstr;
- $sth->bind_param(1, $testName);
- $sth->bind_param(2, $compareRunStart);
- $sth->bind_param(3, $curBuild);
- $sth->bind_param(4, $cfg);
- $sth->execute()
- or die "Execute SELECT previous max(id) error:",$sth->errstr;
- $sth->bind_col (1, \$maxPrevID);
- $sth->bind_col (2, \$prevRunStart);
- $sth->fetch();
- $sth->finish();
-
- if (!defined $maxPrevID || !defined $prevRunStart){
- $prevRun = 0; #-- Previous run is false --#
- if($debug){print "No Previous run returned\n";}
- }
- if($debug && $prevRun){
- print "Max Pervious ID = $maxPrevID\n";
- print "Pervious Run Start date/time = $prevRunStart\n";
- }
+ #-----------Select out maxID Previous ---#
+ local $buildId;
+ local $sth = $dbhRDB->prepare("SELECT max(id), max(run_start)
+ from run_log
+ where name = ?
+ and run_start < ?
+ and build = ?
+ and config_details = ?;")
+ or die "Prepare SELECT previous max(id) error: ", $dbhRDB->errstr;
+ $sth->bind_param(1, $testName);
+ $sth->bind_param(2, $compareRunStart);
+ $sth->bind_param(3, $curBuild);
+ $sth->bind_param(4, $cfg);
+ $sth->execute()
+ or die "Execute SELECT previous max(id) error:",$sth->errstr;
+ $sth->bind_col (1, \$maxPrevID);
+ $sth->bind_col (2, \$prevRunStart);
+ $sth->fetch();
+ $sth->finish();
- if (!$failed){
- $sth = $dbhRDB->prepare("SELECT build_id from run_log where id = ?;")
- or die "Prepare SELECT prev build_id error: ", $dbhRDB->errstr;
- $sth->bind_param(1, $maxPrevID);
- $sth->execute()
- or die "Execute SELECT prev build_id error:",$sth->errstr;
- $sth->bind_col (1, \$buildId);
- $sth->fetch();
- $sth->finish();
- if (!defined $buildId){
- $failed = 1;
- print "BMDB Reporter -> previous build ID not found!!!!\n"
- }
- }
-
- if (!$failed){
- $sth = $dbhRDB->prepare("SELECT revision_id from build_details where id = ?;")
- or die "Prepare SELECT values #2.1 error: ", $dbhRDB->errstr;
- $sth->bind_param(1, $buildId);
- $sth->execute()
- or die "Execute SELECT values #2.1 error:",$sth->errstr;
- $sth->bind_col (1, \$prevRev);
- $sth->fetch();
- $sth->finish();
- if (!defined $prevRev){
- $failed = 1;
- print "BMDB Reporter -> previous revision ID not found!!!!\n"
- }
- }
-
-
- #---Select out value(s) and thread(s) from result_data for Previous ---#
- if (!$failed){
- $sth = $dbhRDB->prepare("SELECT val, threads
- FROM result_data
- WHERE test_results_id IN (SELECT id
- FROM test_results
- WHERE run_log_id = ?);")
- or die "Prepare SELECT values #1 error: ", $dbhRDB->errstr;
- $sth->bind_param(1, $maxPrevID);
- $sth->execute()
+ if (!defined $maxPrevID || !defined $prevRunStart)
+ {
+ $prevRun = 0; #-- Previous run is false --#
+ if($debug){print "No Previous run returned\n";}
+ }
+ if($debug && $prevRun)
+ {
+ print "Max Pervious ID = $maxPrevID\n";
+ print "Pervious Run Start date/time = $prevRunStart\n";
+ }
+ if (!$failed)
+ {
+ $sth = $dbhRDB->prepare("SELECT build_id from run_log where id = ?;")
+ or die "Prepare SELECT prev build_id error: ", $dbhRDB->errstr;
+ $sth->bind_param(1, $maxPrevID);
+ $sth->execute()
+ or die "Execute SELECT prev build_id error:",$sth->errstr;
+ $sth->bind_col (1, \$buildId);
+ $sth->fetch();
+ $sth->finish();
+ if (!defined $buildId)
+ {
+ $failed = 1;
+ print "BMDB Reporter -> previous build ID not found!!!!\n"
+ }
+ }
+ if (!$failed)
+ {
+ $sth = $dbhRDB->prepare("SELECT revision_id from build_details where id = ?;")
+ or die "Prepare SELECT values #2.1 error: ", $dbhRDB->errstr;
+ $sth->bind_param(1, $buildId);
+ $sth->execute()
+ or die "Execute SELECT values #2.1 error:",$sth->errstr;
+ $sth->bind_col (1, \$prevRev);
+ $sth->fetch();
+ $sth->finish();
+ if (!defined $prevRev)
+ {
+ $failed = 1;
+ print "BMDB Reporter -> previous revision ID not found!!!!\n"
+ }
+ }
+ #---Select out value(s) and thread(s) from result_data for Previous ---#
+ if (!$failed)
+ {
+ if (!$ops && !$insDel)
+ {
+ $sth = $dbhRDB->prepare("SELECT val, threads
+ FROM result_data
+ WHERE test_results_id IN (SELECT id
+ FROM test_results
+ WHERE run_log_id = ?);")
+ or die "Prepare SELECT values #1 error: ", $dbhRDB->errstr;
+ $sth->bind_param(1, $maxPrevID);
+ $sth->execute()
or die "Execute SELECT values #1 error:",$sth->errstr;
- $sth->bind_col (1, \$val);
- $sth->bind_col (2, \$threads);
-
- while ($sth->fetch()){
+ $sth->bind_col (1, \$val);
+ $sth->bind_col (2, \$threads);
+ while ($sth->fetch()){
push(@prevValArray,$val);
push(@prevThreadsArray,$threads);
- }
- $sth->finish();
-
- if ($#prevValArray == -1 || $#prevThreadsArray == -1){
+ }
+ $sth->finish();
+ if ($#prevValArray == -1 || $#prevThreadsArray == -1)
+ {
$prevRun = 0;
if($debug){print "No previous result_data found..\n";}
- }
- if ($debug && $prevRun){
+ }
+ if ($debug && $prevRun)
+ {
local $pva = $#prevValArray + 1;
local $pta = $#prevThreadsArray + 1;
print "Previous Value(s) Array has $pva records\n";
print "Previous thread(s) Array has $pta records\n";
}
- }
-
- #-- gather the previous hosts informations --#
- if ($prevRun){
- $sth = $dbhRDB->prepare("SELECT dns, sys_os, sys_conf
- FROM system_details
- WHERE id IN
- (SELECT distinctrow system_id
- FROM system_in_test
- WHERE run_log_id = ?
- ORDER BY system_id);")
- or die "Prepare SELECT main system_id error: ", $dbhRDB->errstr;
+ }
+ elsif($ops)
+ {
+ local $tempName;
+ local $tempOp;
+ $sth = $dbhRDB->prepare("SELECT program, val, tag
+ FROM result_data
+ WHERE test_results_id IN (SELECT id
+ FROM test_results
+ WHERE run_log_id = ?);")
+ or die "Prepare SELECT values #1 error: ", $dbhRDB->errstr;
$sth->bind_param(1, $maxPrevID);
$sth->execute()
- or die "Execute SELECT main system_id error:",$sth->errstr;
- $sth->bind_col (1, \$dns);
- $sth->bind_col (2, \$sysOS);
- $sth->bind_col (3, \$sysConf);
-
+ or die "Execute SELECT values #1 error:",$sth->errstr;
+ $sth->bind_col (1, \$tempName);
+ $sth->bind_col (2, \$val);
+ $sth->bind_col (3, \$tempOp);
while ($sth->fetch()){
- push(@prevHostsArray,$dns);
- push(@prevOSArray,$sysOS);
- push(@prevSysConfArray,$sysConf);
+ push(@prevOpsTestArray,$tempName);
+ push(@prevValArray,$val);
+ push(@prevOpsArray,$tempOp);
}
$sth->finish();
- if ($#prevHostsArray == -1){
- $prevRun = 0;
- if($debug){print "No Previous Hosts found...\n";}
+ if ($#prevOpsTestArray == -1 || $#prevValArray == -1 ||
+ $#prevOpsArray == -1)
+ {
+ $prevRun = 0;
}
- if ($debug && $prevRun){
- print "Previous Test Host Name Array has $#prevHostsArray rows\n";
- print "Previous Host OS Array has $#prevOSArray rows\n";
- print "Previous Host Conf Array has $#prevSysConfArray rows\n";
+ }
+ elsif($insDel)
+ {
+ local $tempName;
+ local $tempOp;
+ $sth = $dbhRDB->prepare("SELECT program, val
+ FROM result_data
+ WHERE test_results_id IN (SELECT id
+ FROM test_results
+ WHERE run_log_id = ?);")
+ or die "Prepare SELECT values #1 error: ", $dbhRDB->errstr;
+ $sth->bind_param(1, $maxPrevID);
+ $sth->execute()
+ or die "Execute SELECT values #1 error:",$sth->errstr;
+ $sth->bind_col (1, \$tempName);
+ $sth->bind_col (2, \$val);
+ while ($sth->fetch()){
+ push(@prevOpsTestArray,$tempName);
+ push(@prevValArray,$val);
}
- }
-
- #--- See if we have matching Hosts ---#
- if ($prevRun){
- $foundPrevHosts=1;
- for ($cur=0;$cur<=$#curHostsArray;$cur++){
- if(!$foundPrevHosts){last;}
- for ($prev=0;$prev<=$#prevHostsArray;$prev++){
- if($prevHostsArray[$prev] eq $curHostsArray[$cur]){
- last;
- }
- else {
- if($prev == $#prevHostsArray) {
- $foundPrevHosts=0;
- }
- }
- }
+ $sth->finish();
+ if ($#prevOpsTestArray == -1 || $#prevValArray == -1)
+ {
+ $prevRun = 0;
}
- }
-
- #-- If we had a prvious run, but host don't match, lets try again --#
- if ($prevRun && !$foundPrevHosts){
- SetCompareDate($prevRunStart);
- return;
- }
-
- if ($prevRun && $foundPrevHosts){
- LogMessage("BMDB Reporter -> Previous Data gathering from DB complete");
- }
- else{
- LogMessage("BMDB Reporter -> Previous Data gathering from DB Failed!!");
- }
- return;
+ }
+ }
+ #-- gather the previous hosts informations --#
+ if ($prevRun)
+ {
+ $sth = $dbhRDB->prepare("SELECT dns, sys_os, sys_conf
+ FROM system_details
+ WHERE id IN
+ (SELECT distinctrow system_id
+ FROM system_in_test
+ WHERE run_log_id = ?
+ ORDER BY system_id);")
+ or die "Prepare SELECT main system_id error: ", $dbhRDB->errstr;
+ $sth->bind_param(1, $maxPrevID);
+ $sth->execute()
+ or die "Execute SELECT main system_id error:",$sth->errstr;
+ $sth->bind_col (1, \$dns);
+ $sth->bind_col (2, \$sysOS);
+ $sth->bind_col (3, \$sysConf);
+ while ($sth->fetch())
+ {
+ push(@prevHostsArray,$dns);
+ push(@prevOSArray,$sysOS);
+ push(@prevSysConfArray,$sysConf);
+ }
+ $sth->finish();
+ if ($#prevHostsArray == -1)
+ {
+ $prevRun = 0;
+ if($debug){print "No Previous Hosts found...\n";}
+ }
+ if ($debug && $prevRun)
+ {
+ print "Previous Test Host Name Array has $#prevHostsArray rows\n";
+ print "Previous Host OS Array has $#prevOSArray rows\n";
+ print "Previous Host Conf Array has $#prevSysConfArray rows\n";
+ }
+ }
+ #--- See if we have matching Hosts ---#
+ if ($prevRun)
+ {
+ $foundPrevHosts=1;
+ for ($cur=0;$cur<=$#curHostsArray;$cur++)
+ {
+ if(!$foundPrevHosts){last;}
+ for ($prev=0;$prev<=$#prevHostsArray;$prev++)
+ {
+ if($prevHostsArray[$prev] eq $curHostsArray[$cur]){last;}
+ elsif($prev == $#prevHostsArray) {$foundPrevHosts=0;}
+ }
+ }
+ }
+ #-- If we had a prvious run, but host don't match, lets try again --#
+ if ($prevRun && !$foundPrevHosts)
+ {
+ SetCompareDate($prevRunStart);
+ return;
+ }
+ if ($prevRun && $foundPrevHosts)
+ {
+ LogMessage("BMDB Reporter -> Previous Data gathering from DB complete");
+ }
+ else
+ {
+ LogMessage("BMDB Reporter -> Previous Data gathering from DB Failed!!");
+ }
+ return;
}
#---------------------------------
@@ -440,6 +531,12 @@ sub ReadFilesForInfo()
print "Start Time = $curRunStart\n";
}
}
+ if ($ops || $insDel && ($_ =~ /(?i)description->/))
+ {
+ ($trash, $measureTag) = split(/->/);
+ $curRunStart = trim($measureTag);
+ if ($debug && defined $measureTag){print "Start Time = $measureTag\n";}
+ }
}
CloseFile (*fh);
@@ -529,64 +626,104 @@ sub WriteReport()
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";}
+ if (!$atomics && !$ops && !$insDel){WriteReportRegular(*fh);}
+ elsif ($atomics){WriteReportAtomics(*fh);}
+ elsif ($ops){WriteReportOPS(*fh);}
+ elsif ($insDel){WriteReportDI(*fh);}
+ print $fh "----------------------------------------------------------------\n";
+ print $fh " Test Host Information \n";
+ print $fh "----------------------------------------------------------------\n";
+ print $fh "\n";
+ for ($count=0;$count<=$#curHostsArray;$count++){
+ print $fh "Host: $curHostsArray[$count]\n";
+ print $fh "OS: $curOSArray[$count]\n";
+ print $fh "Conf: $curSysConfArray[$count]\n\n";
+ }
+ print $fh "\n";
+ print $fh "----------------------------------------------------------------\n";
+ print $fh " Report End\n";
+ print $fh "----------------------------------------------------------------\n";
+ CloseFile (*fh);
+ LogMessage("BMDB Reporter -> Performance Report Created");
+}
+
+sub WriteReportRegular($)
+{
+ local *fh = $_[0];
+ print $fh "Thread(s) Value(s)\n";
print $fh "----------------------------\n";
- for ($count=0;$count<=$#curThreadsArray;$count++)
+ for ($count=0;$count<=$#curValArray;$count++)
{
- if (!$atomics){print $fh "$curThreadsArray[$count] $curValArray[$count]\n";}
- else
- {
- $num = $curThreadsArray[$count];
- if($num == 1){print $fh "Cached Selects $curValArray[$count]\n";}
- elsif($num == 2){print $fh "Random Selects $curValArray[$count]\n";}
- elsif($num == 3){print $fh "Cached Updates $curValArray[$count]\n";}
- elsif($num == 4){print $fh "Random Updates $curValArray[$count]\n";}
- elsif($num == 5){print $fh "Simple Inserts $curValArray[$count]\n";}
- else{print $fh "Error, test case $curThreadsArray[$count] not found\n";}
- }
+ print $fh "$curThreadsArray[$count] $curValArray[$count]\n";
}
print $fh "\n";
if ($prevRun)
{
- print $fh "Previous Date: $prevRunStart\n";
- print $fh "Revision ID: $prevRev\n";
- print $fh "\n";
- if (!$atomics)
- {
- print $fh "Thread(s) Value(s)\n";
- }
- else
+ WritePreviousHead(*fh);
+ print $fh "Thread(s) Value(s)\n";
+ print $fh "----------------------------\n";
+ for ($count=0;$count<=$#prevValArray;$count++)
{
- print $fh "Test Type Value(s)\n";
+ print $fh "$prevThreadsArray[$count] $prevValArray[$count]\n";
}
- print $fh "----------------------------\n";
- for ($count=0;$count<=$#prevThreadsArray;$count++)
+ print $fh "\n";
+ print $fh "Deviation percentage(s) for run.\n";
+ print $fh "\n";
+ print $fh "Threads %\n";
+ print $fh "------- ------\n";
+ for ($count=0;$count<=$#curValArray;$count++)
{
- if ($prevThreadsArray[$count] >= 0 && $prevValArray[$count] >= 0)
+ if (defined $curValArray[$count] && defined $prevValArray[$count])
{
- if (!$atomics)
+ if ($curValArray[$count] >= 0 && $prevValArray[$count] >= 0)
{
- print $fh "$prevThreadsArray[$count] $prevValArray[$count]\n";
+ $percent = (($curValArray[$count] * 100)/$prevValArray[$count]) - 100;
+ if ($percent > 5 || $percent < -5){$devationWarning = 1;}
+ print $fh "$curThreadsArray[$count] $percent\n";
}
- else
- {
- $num = $prevThreadsArray[$count];
- if($num == 1){print $fh "Cached Selects $prevValArray[$count]\n";}
- elsif($num == 2){print $fh "Random Selects $prevValArray[$count]\n";}
- elsif($num == 3){print $fh "Cached Updates $prevValArray[$count]\n";}
- elsif($num == 4){print $fh "Random Updates $prevValArray[$count]\n";}
- elsif($num == 5){print $fh "Simple Inserts $prevValArray[$count]\n";}
- else{print $fh "Error, test case $prevThreadsArray[$count] not found\n";}
- }
}
}
+ }
+ else{print $fh "No Pevious run Records found\n";}
+}
+
+sub WriteReportAtomics($)
+{
+ local *fh = $_[0];
+ print $fh "Test Type Value(s)\n";
+ print $fh "----------------------------\n";
+ for ($count=0;$count<=$#curValArray;$count++)
+ {
+ $num = $curThreadsArray[$count];
+ if($num == 1){print $fh "Cached Selects $curValArray[$count]\n";}
+ elsif($num == 2){print $fh "Random Selects $curValArray[$count]\n";}
+ elsif($num == 3){print $fh "Cached Updates $curValArray[$count]\n";}
+ elsif($num == 4){print $fh "Random Updates $curValArray[$count]\n";}
+ elsif($num == 5){print $fh "Simple Inserts $curValArray[$count]\n";}
+ else{print $fh "Error, test case $curThreadsArray[$count] not found\n";}
+ }
+ print $fh "\n";
+ if ($prevRun)
+ {
+ WritePreviousHead(*fh);
+ print $fh "Test Type Value(s)\n";
+ print $fh "----------------------------\n";
+ for ($count=0;$count<=$#prevValArray;$count++)
+ {
+ $num = $prevThreadsArray[$count];
+ if($num == 1){print $fh "Cached Selects $prevValArray[$count]\n";}
+ elsif($num == 2){print $fh "Random Selects $prevValArray[$count]\n";}
+ elsif($num == 3){print $fh "Cached Updates $prevValArray[$count]\n";}
+ elsif($num == 4){print $fh "Random Updates $prevValArray[$count]\n";}
+ elsif($num == 5){print $fh "Simple Inserts $prevValArray[$count]\n";}
+ else{print $fh "Error, test case $prevThreadsArray[$count] not found\n";}
+ }
print $fh "\n";
print $fh "Deviation percentage(s) for run.\n";
print $fh "\n";
- print $fh "Threads %\n";
- print $fh "------- ------\n";
- for ($count=0;$count<=$#curThreadsArray;$count++)
+ print $fh "Test %\n";
+ print $fh "------- ------\n";
+ for ($count=0;$count<=$#curValArray;$count++)
{
if (defined $curValArray[$count] && defined $prevValArray[$count])
{
@@ -594,40 +731,127 @@ sub WriteReport()
{
$percent = (($curValArray[$count] * 100)/$prevValArray[$count]) - 100;
if ($percent > 5 || $percent < -5){$devationWarning = 1;}
- if(!$atomics){print $fh "$curThreadsArray[$count] $percent\n";}
+ {
+ $num = $curThreadsArray[$count];
+ if($num == 1){print $fh "Cached Selects $percent\n";}
+ elsif($num == 2){print $fh "Random Selects $percent\n";}
+ elsif($num == 3){print $fh "Cached Updates $percent\n";}
+ elsif($num == 4){print $fh "Random Updates $percent\n";}
+ elsif($num == 5){print $fh "Simple Inserts $percent\n";}
+ else{print $fh "Error, test case $curThreadsArray[$count] not found\n";}
+ }
+ }
+ }
+ }
+ }
+ else{print $fh "No Pevious run Records found\n";}
+}
+
+sub WriteReportOPS($)
+{
+ local *fh = $_[0];
+ print $fh "Test Name Operation Value(s)\n";
+ print $fh "-----------------------------------\n";
+ for ($count=0;$count<=$#curValArray;$count++)
+ {
+ print $fh "$curOpsTestArray[$count] -> $curOpsArray[$count] -> $curValArray[$count]\n";
+ }
+ print $fh "\n";
+ if ($prevRun)
+ {
+ WritePreviousHead(*fh);
+ print $fh "Test Name Operation Value(s)\n";
+ print $fh "-----------------------------------\n";
+ for ($count=0;$count<=$#prevValArray;$count++)
+ {
+ print $fh "$prevOpsTestArray[$count] -> $prevOpsArray[$count] -> $prevValArray[$count]\n";
+ }
+ print $fh "\n";
+ print $fh "Deviation percentage(s) for run.\n";
+ print $fh "\n";
+ print $fh "Test OPS %\n";
+ print $fh "-----------------------\n";
+ for ($count=0;$count<=$#curValArray;$count++)
+ {
+ if (defined $curValArray[$count] && defined $prevValArray[$count])
+ {
+ if ($curOpsTestArray[$count] eq $prevOpsTestArray[$count] &&
+ $curOpsArray[$count] eq $prevOpsArray[$count] )
+ {
+ if ($curValArray[$count] > 0 && $prevValArray[$count] > 0)
+ {
+ $percent = (($curValArray[$count] * 100)/$prevValArray[$count]) - 100;
+ }
else
{
- $num = $curThreadsArray[$count];
- if($num == 1){print $fh "Cached Selects $percent\n";}
- elsif($num == 2){print $fh "Random Selects $percent\n";}
- elsif($num == 3){print $fh "Cached Updates $percent\n";}
- elsif($num == 4){print $fh "Random Updates $percent\n";}
- elsif($num == 5){print $fh "Simple Inserts $percent\n";}
- else{print $fh "Error, test case $curThreadsArray[$count] not found\n";}
+ if($curValArray[$count] > $prevValArray[$count])
+ {
+ $percent = ($curValArray[$count] * 100);
+ }
+ else
+ {
+ $percent = ($prevValArray[$count] * 100);
+ $percent = "-"."$percent";
+ }
}
+ print $fh "$curOpsTestArray[$count] $curOpsArray[$count] $percent\n";
}
}
}
- }
- else{
- print $fh "No Pevious run Records found\n";
}
- print $fh "----------------------------------------------------------------\n";
- print $fh " Test Host Information \n";
- print $fh "----------------------------------------------------------------\n";
+ else{print $fh "No Pevious run Records found\n";}
+}
+
+sub WriteReportDI($)
+{
+ local *fh = $_[0];
+ print $fh "Test Name Value(s)\n";
+ print $fh "----------------------------\n";
+ for ($count=0;$count<=$#curValArray;$count++)
+ {
+ print $fh "$curOpsTestArray[$count] -> $curValArray[$count]\n";
+ }
print $fh "\n";
- for ($count=0;$count<=$#curHostsArray;$count++){
- print $fh "Host: $curHostsArray[$count]\n";
- print $fh "OS: $curOSArray[$count]\n";
- print $fh "Conf: $curSysConfArray[$count]\n\n";
+ if ($prevRun)
+ {
+ WritePreviousHead(*fh);
+ print $fh "Test Name Value(s)\n";
+ print $fh "----------------------------\n";
+ for ($count=0;$count<=$#prevValArray;$count++)
+ {
+ print $fh "$prevOpsTestArray[$count] -> $prevValArray[$count]\n";
+ }
+ print $fh "\n";
+ print $fh "Deviation percentage(s) for run.\n";
+ print $fh "\n";
+ print $fh " Test %\n";
+ print $fh "------- ------\n";
+ for ($count=0;$count<=$#curValArray;$count++)
+ {
+ if (defined $curValArray[$count] && defined $prevValArray[$count])
+ {
+ if ($curOpsTestArray[$count] eq $prevOpsTestArray[$count])
+ {
+ if ($curValArray[$count] > 0 && $prevValArray[$count] > 0)
+ {
+ $percent = (($curValArray[$count] * 100)/$prevValArray[$count]) - 100;
+ print $fh "$curOpsTestArray[$count] $percent\n";
+ }
+ }
+ }
+ }
}
+ else{print $fh "No Pevious run Records found\n";}
+}
+
+sub WritePreviousHead($)
+{
+ local *fh = $_[0];
+ print $fh "Previous Date: $prevRunStart\n";
+ print $fh "Revision ID: $prevRev\n";
print $fh "\n";
- print $fh "----------------------------------------------------------------\n";
- print $fh " Report End\n";
- print $fh "----------------------------------------------------------------\n";
- CloseFile (*fh);
- LogMessage("BMDB Reporter -> Performance Report Created");
}
+
#---------------------------------
# Send the report out in email
#---------------------------------
@@ -857,7 +1081,9 @@ sub CollectCommandPromptInfo ()
"cloneRevFile:s"=>\$cloneFile,
"emailList:s"=>\$mailList,
"debug"=>\$debug,
- "atomics"=>\$atomics))
+ "ops"=>\$ops,
+ "atomics"=>\$atomics,
+ "delIns"=>\$insDel))
{
Usage();
}
=== modified file 'tools/resultsDBupdate.pl'
--- a/tools/resultsDBupdate.pl 2008-12-17 15:05:57 +0000
+++ b/tools/resultsDBupdate.pl 2009-02-27 18:32:22 +0000
@@ -42,6 +42,10 @@ our $cloneFile='NULL';
our @sysPks;
our @numThreads;
our @results;
+our @opsTest;
+our @operation;
+our $ops=0;
+our $insDel=0;
our $buildId;
our $testDetailId;
our $testScript;
@@ -156,14 +160,15 @@ sub CollectCommandPromptInfo ()
"resultsFile:s"=>\$resultsFile,
"infoFile:s"=>\$testInfoFile,
"logfile:s"=>\$logfile,
- "cloneRevLog:s"=>\$cloneFile))
+ "cloneRevLog:s"=>\$cloneFile,
+ "ops"=>\$ops,
+ "delIns"=>\$insDel))
{
Usage();
}
-
if ($help){Usage();}
-
- if ($our_useSock){
+ if ($our_useSock)
+ {
$ENV{MYSQL_UNIX_PORT} = $our_sockPath;
}
if ($resultsDB eq 'NULL' || $pkFile eq 'NULL' ||
@@ -176,12 +181,12 @@ sub CollectCommandPromptInfo ()
Usage();
}
LogMessage("BMDB UPDATE-> Done with Command Prompt");
-
}
#---------------------------------------------
# File OPS
#---------------------------------------------
-sub OpenFileRead ($$){
+sub OpenFileRead ($$)
+{
local *handle = $_[0];
local $file = $_[1];
$handle = IO::File->new("$file", O_RDONLY)
@@ -190,18 +195,18 @@ sub OpenFileRead ($$){
#--------------------
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);
- }
+ 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 ($$){
+sub OpenFileForWrite ($$)
+{
local *handle = $_[0];
local $file = $_[1];
$handle = IO::File->new("$file", O_WRONLY|O_TRUNC|O_CREAT)
@@ -223,17 +228,20 @@ sub ReadPkDetails ()
while (<$fh>)
{
chomp;
- if ($_ =~ /(?i)build_id:/){
+ if ($_ =~ /(?i)build_id:/)
+ {
($trash, $buildId) = split(/:/);
if($debug){print "build pk = $buildId\n";}
}
- if ($_ =~ /(?i)systems_ids/){
+ if ($_ =~ /(?i)systems_ids/)
+ {
local $s_pks=0;
($trash, $s_pks) = split(/:/);
if($debug){print "system pks = $s_pks\n";}
@sysPks = split(/\,/,$s_pks);
}
- if ($_ =~ /(?i)test_id/){
+ if ($_ =~ /(?i)test_id/)
+ {
($trash, $testDetailId) = split(/:/);
if($debug){print "test pk = $testDetailId\n";}
}
@@ -246,87 +254,139 @@ sub ReadTestResults()
{
local $fh;
local $trash;
-
+ local $tempTest;
+ local $tempOp;
OpenFileRead (*fh,$resultsFile);
- while (<$fh>)
+ if(!$ops && !$insDel)
{
- chomp;
- ($threads,$result) = split(/\,/);
- push(@numThreads,$threads);
- push(@results,$result);
+ while (<$fh>)
+ {
+ chomp;
+ ($threads,$result) = split(/\,/);
+ push(@numThreads,$threads);
+ push(@results,$result);
+ }
}
- if($debug){
- for ($count=0;$count<=$#numThreads;$count++){
- print "$numThreads[$count], $results[$count]\n";
- }
+ elsif($ops)
+ {
+ while (<$fh>)
+ {
+ chomp;
+ ($tempTest,$tempOp,$result) = split(/\,/);
+ push(@opsTest,$tempTest);
+ push(@operation,$tempOp);
+ push(@results,$result);
+ }
+ }
+ else
+ {
+ while (<$fh>)
+ {
+ chomp;
+ ($tempTest,$result) = split(/\,/);
+ push(@opsTest,$tempTest);
+ push(@results,$result);
+ }
}
- CloseFile (*fh);
+ if($debug && !$ops)
+ {
+ for ($count=0;$count<=$#numThreads;$count++)
+ {
+ print "$numThreads[$count], $results[$count]\n";
+ }
+ }
+ elsif($debug && $ops)
+ {
+ for ($count=0;$count<=$#operation;$count++)
+ {
+ print "$opsTest[$count], $operation[$count] $results[$count]\n";
+ }
+ }
+ elsif($debug)
+ {
+ for ($count=0;$count<=$#operation;$count++)
+ {
+ print "$opsTest[$count], $results[$count]\n";
+ }
+ }
+ CloseFile (*fh);
OpenFileRead (*fh,$testInfoFile);
while (<$fh>)
{
- chomp;
- if ($_ =~ /(?i)name->/){
- ($trash, $testName) = split(/->/);
- $testName = trim($testName);
- if($debug){print "Test Name = $testName\n";}
- }
- if ($_ =~ /(?i)start->/){
- ($trash, $startTime) = split(/->/);
- $startTime = trim($startTime);
- if($debug){print "Start Time = $startTime\n";}
- }
- if ($_ =~ /(?i)end->/){
- ($trash, $endTime) = split(/->/);
- $endTime = trim($endTime);
- if($debug){print "End Time = $endTime\n";}
- }
- if ($_ =~ /(?i)testType->/){
- ($trash, $testType) = split(/->/);
- $testType = trim($testType);
- if($debug){print "Test Type = $testType\n";}
- }
- if ($_ =~ /(?i)results->/){
- ($trash, $resultPath) = split(/->/);
- $resultPath = trim($resultPath);
- if($debug){print "Results Path = $resultPath\n";}
- }
- if ($_ =~ /(?i)exit->/){
- ($trash, $exitCode) = split(/->/);
- if($debug){print "Exit Code = $exitCode\n";}
- }
- if ($_ =~ /(?i)dataType->/){
- ($trash, $dataType) = split(/->/);
- $dataType = trim($dataType);
- if($debug){print "Data Type = $dataType\n";}
- }
- if ($_ =~ /(?i)tag->/){
- ($trash, $tag) = split(/->/);
- $tag = trim($tag);
- if($debug){print "tag = $tag\n";}
- }
- if ($_ =~ /(?i)description->/){
- ($trash, $descript) = split(/->/);
- $descript = trim($descript);
- if($debug){print "description = $descript\n";}
- }
-
+ chomp;
+ if ($_ =~ /(?i)name->/)
+ {
+ ($trash, $testName) = split(/->/);
+ $testName = trim($testName);
+ if($debug){print "Test Name = $testName\n";}
+ }
+ elsif ($_ =~ /(?i)start->/)
+ {
+ ($trash, $startTime) = split(/->/);
+ $startTime = trim($startTime);
+ if($debug){print "Start Time = $startTime\n";}
+ }
+ elsif ($_ =~ /(?i)end->/)
+ {
+ ($trash, $endTime) = split(/->/);
+ $endTime = trim($endTime);
+ if($debug){print "End Time = $endTime\n";}
+ }
+ elsif ($_ =~ /(?i)testType->/)
+ {
+ ($trash, $testType) = split(/->/);
+ $testType = trim($testType);
+ if($debug){print "Test Type = $testType\n";}
+ }
+ elsif ($_ =~ /(?i)results->/)
+ {
+ ($trash, $resultPath) = split(/->/);
+ $resultPath = trim($resultPath);
+ if($debug){print "Results Path = $resultPath\n";}
+ }
+ elsif ($_ =~ /(?i)exit->/)
+ {
+ ($trash, $exitCode) = split(/->/);
+ if($debug){print "Exit Code = $exitCode\n";}
+ }
+ elsif ($_ =~ /(?i)dataType->/)
+ {
+ ($trash, $dataType) = split(/->/);
+ $dataType = trim($dataType);
+ if($debug){print "Data Type = $dataType\n";}
+ }
+ elsif ($_ =~ /(?i)tag->/)
+ {
+ ($trash, $tag) = split(/->/);
+ $tag = trim($tag);
+ if($debug){print "tag = $tag\n";}
+ }
+ elsif ($_ =~ /(?i)description->/)
+ {
+ ($trash, $descript) = split(/->/);
+ $descript = trim($descript);
+ if($debug){print "description = $descript\n";}
+ }
}
CloseFile (*fh);
OpenFileRead (*fh,$cloneFile);
while (<$fh>)
{
- if ($_ =~ /(?i)res_dir:/){
+ if ($_ =~ /(?i)res_dir:/)
+ {
($trash, $resultPath) = split(/:/);
$resultPath = trim($resultPath);
if($debug){print "Results Path = $resultPath\n";}
}
- if ($_ =~ /(?i)clone:/){
+ if ($_ =~ /(?i)clone:/)
+ {
($trash, $clone) = split(/:/);
$clone = trim($clone);
if($debug){print "Clone = $clone\n";}
}
- if ($_ =~ /(?i)configuration:/){
+ if ($_ =~ /(?i)configuration:/)
+ {
($trash, $temp) = split(/:/);
($trash,$trash,$cfg) = File::Spec->splitpath($temp);
$cfg = trim($cfg);
@@ -362,7 +422,8 @@ sub ConnectToDatabases ()
################################
# Connect to Master Using port
################################
- if (!$our_useSock){
+ if (!$our_useSock)
+ {
local $dsn = "DBI:mysql:database=$resultsDB;host=$resultsDB_host;port=$resultsDB_port";
$dbhRDB = DBI->connect("$dsn","$resultsDB_user","$resultsDB_pass")
or die "Can't connect to MySQL process! Error: $DBI::errstr\n";
@@ -370,7 +431,8 @@ sub ConnectToDatabases ()
################################
# Connect to Master Using Socket
################################
- if ($our_useSock){
+ if ($our_useSock)
+ {
$dbhRDB = DBI->connect("DBI:mysql:database=$resultsDB;host=$resultsDB_host",
"$resultsDB_user", "$resultsDB_pass", {RaiseError => 0,PrintError =>0})
or die "Can't connect to MySQL process! Error: $DBI::errstr\n";
@@ -491,22 +553,58 @@ sub InsertTestResults($$$$$$$)
$sth->fetch();
$sth->finish();
- $sth = $dbhRDB->prepare("INSERT INTO result_data
+ local $count;
+ if ($ops)
+ {
+ $sth = $dbhRDB->prepare("INSERT INTO result_data
+ (test_results_id, sit_id, program, val, tag)
+ VALUES(?,?,?,?,?);")
+ or die "Prepare insert into result_data table Error: ", $dbhRDB->errstr;
+ for ($count=0;$count<=$#opsTest;$count++)
+ {
+ $sth->bind_param(1, $testResultsId);
+ $sth->bind_param(2, $sysInTestId);
+ $sth->bind_param(3, $opsTest[$count]);
+ $sth->bind_param(4, $results[$count]);
+ $sth->bind_param(5, $operation[$count]);
+ $sth->execute()
+ or die "Error inserting in to result_data table: ", $sth->errstr;
+ }
+ }
+ elsif($insDel)
+ {
+ $sth = $dbhRDB->prepare("INSERT INTO result_data
+ (test_results_id, sit_id, program, val)
+ VALUES(?,?,?,?);")
+ or die "Prepare insert into result_data table Error: ", $dbhRDB->errstr;
+ for ($count=0;$count<=$#opsTest;$count++)
+ {
+ $sth->bind_param(1, $testResultsId);
+ $sth->bind_param(2, $sysInTestId);
+ $sth->bind_param(3, $opsTest[$count]);
+ $sth->bind_param(4, $results[$count]);
+ $sth->execute()
+ or die "Error inserting in to result_data table: ", $sth->errstr;
+ }
+ }
+ else
+ {
+ $sth = $dbhRDB->prepare("INSERT INTO result_data
(test_results_id, sit_id, data_type,
val, tag, threads)
VALUES(?,?,?,?,?,?);")
- or die "Prepare insert into result_data table Error: ", $dbhRDB->errstr;
- local $count;
- for ($count=0;$count<=$#numThreads;$count++)
- {
- $sth->bind_param(1, $testResultsId);
- $sth->bind_param(2, $sysInTestId);
- $sth->bind_param(3, $_[3]);
- $sth->bind_param(4, $results[$count]);
- $sth->bind_param(5, $_[4]);
- $sth->bind_param(6, $numThreads[$count]);
- $sth->execute()
- or die "Error inserting in to result_data table: ", $sth->errstr;
+ or die "Prepare insert into result_data table Error: ", $dbhRDB->errstr;
+ for ($count=0;$count<=$#numThreads;$count++)
+ {
+ $sth->bind_param(1, $testResultsId);
+ $sth->bind_param(2, $sysInTestId);
+ $sth->bind_param(3, $_[3]);
+ $sth->bind_param(4, $results[$count]);
+ $sth->bind_param(5, $_[4]);
+ $sth->bind_param(6, $numThreads[$count]);
+ $sth->execute()
+ or die "Error inserting in to result_data table: ", $sth->errstr;
+ }
}
$sth->finish();
=== modified file 'tools/verify_slave.pl'
--- a/tools/verify_slave.pl 2008-12-17 15:05:57 +0000
+++ b/tools/verify_slave.pl 2009-02-27 18:32:22 +0000
@@ -98,7 +98,14 @@ sub DropTS ();
sub Usage ();
sub Passed();
sub Failed();
-
+# Tools
+sub SQL_ExecuteError($$$);
+sub LogMessage($);
+sub FailedDBI ($);
+sub CloseFile ($);
+sub OpenFileForWrite ($$);
+sub OpenFileAppend ($$);
+sub OpenFileRead ($$);
#--------------------------------------------------
# Program Main
#--------------------------------------------------
@@ -111,22 +118,22 @@ sub main ()
if ($syncOnly)
{
ConnectToBoth();
- print $fh "Verify_Slave -> Syncing Slave with Master..\n";
+ LogMessage("Verify_Slave -> Syncing Slave with Master..");
SyncSlaveWithMaster();
DisconnectFromBoth();
if($syncFailed != 1)
{
- print $fh "Verify_Slave -> Drop and Sync Completed...\n";
+ LogMessage("Verify_Slave -> Drop and Sync Completed...");
Passed();
}
- print $fh "Verify_Slave -> Drop and Sync Failed...\n";
+ LogMessage("Verify_Slave -> Drop and Sync Failed...");
Failed();
}
if ($dropOnly)
{
ConnectToMaster();
- print $fh "Verify_Slave -> Dropping Database!\n";
+ LogMessage("Verify_Slave -> Dropping Database!");
DropDatabase();
DisconnectFromMaster();
Passed();
@@ -135,45 +142,45 @@ sub main ()
if ($dropSync)
{
ConnectToBoth();
- print $fh "Verify_Slave -> Dropping Database!\n";
+ LogMessage("Verify_Slave -> Dropping Database!");
DropDatabase();
- print $fh "Verify_Slave -> Syncing Slave with Master..\n";
+ LogMessage("Verify_Slave -> Syncing Slave with Master..");
SyncSlaveWithMaster();
DisconnectFromBoth();
if($syncFailed != 1)
{
- print $fh "Verify_Slave -> Drop and Sync Completed...\n";
+ LogMessage("Verify_Slave -> Drop and Sync Completed...");
Passed();
}
- print $fh "Verify_Slave -> Drop and Sync Failed...\n";
+ LogMessage("Verify_Slave -> Drop and Sync Failed...");
Failed();
}
if ($verifyOnly)
{
ConnectToBoth();
- print $fh "Verify_Slave -> Syncing Slave with Master..\n";
+ LogMessage("Verify_Slave -> Syncing Slave with Master..");
SyncSlaveWithMaster();
if($syncFailed != 1)
{
- print $fh "Verify_Slave -> Verifing Slave data...\n";
+ LogMessage("Verify_Slave -> Verifing Slave data...");
VerifySlave();
DisconnectFromBoth();
if($inSync != 1)
{
- print $fh "Verify_Slave -> Master & Slave data verified...\n";
+ LogMessage("Verify_Slave -> Master & Slave data verified...");
Passed();
}
else
{
- print $fh "Verify_Slave -> Master & Slave data out of sync!!!\n";
+ LogMessage("Verify_Slave -> Master & Slave data out of sync!!!");
Failed();
}
}
else
{
DisconnectFromBoth();
- print $fh "Verify_Slave -> Failed to sync Slave w/ Master!!!\n";
+ LogMessage("Verify_Slave -> Failed to sync Slave w/ Master!!!");
Failed();
}
}
@@ -181,38 +188,38 @@ sub main ()
if ($verifyDrop)
{
ConnectToBoth();
- print $fh "Verify_Slave -> Syncing Slave with Master..\n";
+ LogMessage("Verify_Slave -> Syncing Slave with Master..");
SyncSlaveWithMaster();
if($syncFailed != 1)
{
- print $fh "Verify_Slave -> Verifing Slave data...\n";
+ LogMessage("Verify_Slave -> Verifing Slave data...");
VerifySlave();
- print $fh "Verify_Slave -> Dropping Data...\n";
+ LogMessage("Verify_Slave -> Dropping Data...");
DropDatabase();
SyncSlaveWithMaster();
DisconnectFromBoth();
if($inSync != 1)
{
- print $fh "Verify_Slave -> Master & Slave data verified...\n";
+ LogMessage("Verify_Slave -> Master & Slave data verified...");
Passed();
}
else
{
- print $fh "Verify_Slave -> Master & Slave data out of sync!!!\n";
+ LogMessage("Verify_Slave -> Master & Slave data out of sync!!!");
Failed();
}
}
else
{
- print $fh "Verify_Slave -> Failed to sync Slave w/ Master!!!\n";
+ LogMessage("Verify_Slave -> Failed to sync Slave w/ Master!!!");
DropDatabase();
SyncSlaveWithMaster();
- print $fh "Verify_Slave -> Dropping Data...\n";
+ LogMessage("Verify_Slave -> Dropping Data...");
DisconnectFromBoth();
Failed();
}
}
- print $fh "Verify_Slave -> Script Error!!!!!\n";
+ LogMessage("Verify_Slave -> Script Error!!!!!");
Usage();
Failed();
}
@@ -285,14 +292,12 @@ sub Usage ()
sub Passed ()
{
- $fh->close;
print 0;
exit 0;
}
sub Failed ()
{
- $fh->close;
print 1;
exit 1;
}
@@ -321,8 +326,8 @@ sub CollectCommandPromptInfo ()
"tables:s"=>\$tables,
"rdd"=>\$diskData,
"numOfDataFiles:i"=>\$numberOfData,
- "tableSpace:s"=>\$nameOfTS,
- "nameOfLFG:s"=>\$nameOfLFG,
+ "tsName:s"=>\$nameOfTS,
+ "lfgName:s"=>\$nameOfLFG,
"dropOnly"=>\$dropOnly,
"dropSync"=>\$dropSync,
"syncOnly"=>\$syncOnly,
@@ -339,29 +344,18 @@ sub CollectCommandPromptInfo ()
$ENV{MYSQL_UNIX_PORT} = $our_sockPath;
}
- if(-e "$logFile")
- {
- $fh = IO::File->new("$logFile", O_WRONLY|O_APPEND)
- or die "ERROR: could not open $logFile: $!\n";
- }
- else
- {
- $fh = IO::File->new("$logFile", O_WRONLY|O_EXCL|O_CREAT)
- or die "ERROR: could not open $logFile: $!\n";
- }
-
- print $fh "Verify_Slave -> CollectCommandPrompt Complete\n";
+ LogMessage("Verify_Slave -> CollectCommandPrompt Complete");
if ($verifyDrop || $verifyOnly)
{
$mysqlDump="$binDir/mysqldump";
- if(! -e "$mysqlDump")
+ if(! -e "$mysqlDump" && !$dropOnly)
{
- print $fh "Verify_Slave -> $mysqlDump does not exist!!\n";
+ LogMessage("Verify_Slave -> $mysqlDump does not exist!!");
Failed();
}
if($tables eq '' || $dbToVerify eq '')
{
- print $fh "Verify_Slave -> Enter DB and Tables on command-line!!\n";
+ LogMessage("Verify_Slave -> Enter DB and Tables on command-line!!");
Failed();
}
}
@@ -381,7 +375,7 @@ sub ConnectToMaster ()
}
if($failed == 1)
{
- print $fh "Verify_Slave -> Master Connection Error: $DBI::errstr\n";
+ LogMessage("Verify_Slave -> Master Connection Error: $DBI::errstr");
Failed();
}
@@ -393,10 +387,10 @@ sub ConnectToMaster ()
}
if($failed == 1)
{
- print $fh "Verify_Slave -> Master Connection Error: $DBI::errstr\n";
+ LogMessage("Verify_Slave -> Master Connection Error: $DBI::errstr");
Failed();
}
- print $fh "Verify_Slave -> Connected Master\n";
+ LogMessage("Verify_Slave -> Connected Master");
}
sub ConnectToSlave ()
@@ -406,10 +400,10 @@ sub ConnectToSlave ()
or $failed = 1;
if($failed == 1)
{
- print $fh "Verify_Slave -> Slave Connection Error: $DBI::errstr\n";
+ LogMessage("Verify_Slave -> Slave Connection Error: $DBI::errstr");
Failed();
}
- print $fh "Verify_Slave -> Connected Slave\n";
+ LogMessage("Verify_Slave -> Connected Slave");
}
sub ConnectToBoth()
@@ -449,30 +443,32 @@ sub SyncSlaveWithMaster ()
my $getEpochFailed=0;
my $masterEpoch_sth = $dbhM->prepare("SELECT MAX(epoch) FROM mysql.ndb_binlog_index;")
- or die "Prepare max(epoch) from ndb_binlog_index error: ", $dbhM->errstr;
+ or FailedDBI("Prepare max(epoch) from ndb_binlog_index error: ");
$masterEpoch_sth->execute()
- or die "Select max(epoch) from ndb_binlog_index execute failed\n",$sth->errstr;
+ or SQL_ExecuteError("Select max(epoch) from ndb_binlog_index execute failed",
+ 1,$masterEpoch_sth);
$masterEpoch_sth->bind_col (1, \$masterEpoch);
$masterEpoch_sth->fetch();
$masterEpoch_sth->finish();
if($masterEpoch == 0 || $masterEpoch eq '')
{
- print $fh "Verify_Slave -> Failed! Master epoch returned: $masterEpoch\n";
+ LogMessage("Verify_Slave -> Failed! Master epoch returned: $masterEpoch");
$getEpochFailed=1;
}
else
{
- print $fh "Verify_Slave -> Master epoch returned: $masterEpoch\n";
+ LogMessage("Verify_Slave -> Master epoch returned: $masterEpoch");
}
if (!$getEpochFailed)
{
my $slaveEpoch_sth = $dbhS->prepare("SELECT MAX(epoch) FROM mysql.ndb_apply_status;")
- or die "Prepare select epoch from ndb_apply_status error: ", $dbhM->errstr;
+ or FailedDBI("Prepare select epoch from ndb_apply_status error: ");
while($slaveEpoch < $masterEpoch)
{
$slaveEpoch_sth->execute()
- or die "Select epoch from ndb_apply_status execute failed\n",$sth->errstr;
+ or SQL_ExecuteError("Select epoch from ndb_apply_status execute failed\n",
+ 1,$slaveEpoch_sth);
$slaveEpoch_sth->bind_col (1, \$slaveEpoch);
$slaveEpoch_sth->fetch();
if($slaveEpoch == $slaveEpochHold)
@@ -483,7 +479,7 @@ sub SyncSlaveWithMaster ()
}
else
{
- print $fh "Verify_Slave -> Current Slave epoch returned: $slaveEpoch\n";
+ LogMessage("Verify_Slave -> Current Slave epoch returned: $slaveEpoch");
$slaveEpochHold = $slaveEpoch;
$totalLoops++;
$loops=0;
@@ -494,14 +490,14 @@ sub SyncSlaveWithMaster ()
$slaveEpoch_sth->finish();
if ($slaveEpoch >= $masterEpoch)
{
- print $fh "Verify_Slave -> Slave has caught up with Master...\n";
+ LogMessage("Verify_Slave -> Slave has caught up with Master...");
$syncFailed=0;
}
else
{
- print $fh "Verify_Slave -> Last Slave epoch returned: $slaveEpoch\n";
+ LogMessage("Verify_Slave -> Last Slave epoch returned: $slaveEpoch");
my $time = $sleepTime*$totalLoops;
- print $fh "Verify_Slave -> Slave epoch != master in ($time) seconds\n";
+ LogMessage("Verify_Slave -> Slave epoch != master in ($time) seconds");
$syncFailed=1;
}
}
@@ -532,7 +528,7 @@ sub VerifySlave()
system("rm $masterDump");
system("rm $slaveDump");
system("mv $diffFile $failureDir");
- print $fh "Verify_Slave -> review $failureDir $diffFile!!!\n";
+ LogMessage("Verify_Slave -> review $failureDir $diffFile!!!");
$inSync=1;
}
else
@@ -545,17 +541,17 @@ sub VerifySlave()
}
else
{
- print $fh "Verify_Slave -> Database Dumps Failed!!!!\n";
+ LogMessage("Verify_Slave -> Database Dumps Failed!!!!");
}
}
sub DropDatabase ()
{
- print $fh "Verify_Slave -> Dropping $dbToVerify Database !!!!\n";
+ LogMessage("Verify_Slave -> Dropping $dbToVerify Database !!!!");
my $masterDropDB_sth = $dbhM->prepare("DROP DATABASE $dbToVerify;")
- or die "Prepare Drop DB error: ", $dbhM->errstr;
+ or FailedDBI("Prepare Drop DB error: ");
$masterDropDB_sth->execute()
- or die "Drop $dbToVerify execute failed\n",$sth->errstr;
+ or SQL_ExecuteError("Drop $dbToVerify execute failed",1,$masterDropDB_sth);
$masterDropDB_sth->finish();
if($diskData)
{
@@ -576,34 +572,34 @@ sub DropTS ()
while ($dfCount > 0)
{
$file="datafile".$dfCount.".dat";
- print $fh "Verify_Slave -> Removing TS $file..\n";
+ LogMessage("Verify_Slave -> Removing TS $file..");
$sth = $dbhM->prepare("ALTER TABLESPACE $nameOfTS
DROP DATAFILE '$file'
ENGINE = NDB;")
- or die "Prepare drop data file loop error: ", $dbhM->errstr;
+ or FailedDBI("Prepare drop data file loop error: ");
$sth->execute()
- or die "Drop Data file Error: ", $sth->errstr;
+ or SQL_ExecuteError("Alter Data file Error: ",1,$sth);
$sth->finish();
$dfCount--;
}
}
- print $fh "Verify_Slave -> Removing TS datafile.dat\n";
+ LogMessage("Verify_Slave -> Removing TS datafile.dat");
$sth = $dbhM->prepare("ALTER TABLESPACE $nameOfTS
DROP DATAFILE 'datafile.dat'
ENGINE = NDB;")
- or die "Prepare drop data file error: ", $dbhM->errstr;
+ or FailedDBI("Prepare drop data file error: ");
$sth->execute()
- or die "Drop Data file Error: ", $sth->errstr;
+ or SQL_ExecuteError("Drop Data file Error: ",1,$sth);
$sth->finish();
- print $fh "Verify_Slave -> TS Data File(s) Dropped.........\n";
+ LogMessage("Verify_Slave -> TS Data File(s) Dropped.........");
$sth = $dbhM->prepare("DROP TABLESPACE $nameOfTS ENGINE = NDB;")
- or die "Prepare drop table space error: ", $dbhM->errstr;
+ or FailedDBI("Prepare drop table space error: ");
$sth->execute()
- or die "Drop table space Error: ", $sth->errstr;
+ or SQL_ExecuteError("Drop table space Error: ",1,$sth);
$sth->finish();
- print $fh "Verify_Slave -> Tables Space $nameOfTS Dropped!!\n";
+ LogMessage("Verify_Slave -> Tables Space $nameOfTS Dropped!!");
DropLFG();
}
@@ -615,14 +611,114 @@ sub DropLFG ()
my $sth = '';
$sth = $dbhM->prepare("DROP LOGFILE GROUP $nameOfLFG ENGINE=NDB;")
- or die "Prepare drop LFG error: ", $dbhM->errstr;
+ or FailedDBI("Prepare drop LFG error: ");
$sth->execute()
- or die "Drop LFG Error: ", $sth->errstr;
+ or SQL_ExecuteError("Drop LFG Error: ",1,$sth);
$sth->finish();
- print $fh "Verify_Slave -> Log File Group $nameOfLFG Dropped!!!\n";
+ LogMessage("Verify_Slave -> Log File Group $nameOfLFG Dropped!!!");
+
+}
+
+
+#--------------------------
+# Logging
+#--------------------------
+sub LogMessage($)
+{
+ if (defined $logFile)
+ {
+ local $fh;
+ OpenFileAppend (*fh,$logFile);
+ print $fh "$_[0]\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;
+}
+
+#----------------
+# Error Handlers
+#----------------
+sub FailedDBI ($)
+{
+ $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;
+ local *sth = $_[0];
+ 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;
+ exit 1;
}
+
#-----------------------
# End of script
#-----------------------
| Thread |
|---|
| • bzr commit into file:///space/cluster_rep_auto/ branch (Jonathan.Miller:22) | Jonathan.Miller | 27 Feb |
