From: Martin Zaun Date: January 11 2011 4:11pm Subject: bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4016) List-Archive: http://lists.mysql.com/commits/128447 Message-Id: <201101111611.p0BE3GUk011681@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0069680194==" --===============0069680194== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mz/mysql/ndb-7.1-opt64/ based on revid:martin.zaun@stripped 4016 Martin Zaun 2011-01-11 crund - minor changes added: storage/ndb/test/crund/scripts/mytwscxx.sh storage/ndb/test/crund/scripts/mytwsjava.sh renamed: storage/ndb/test/crund/scripts/mytest.sh => storage/ndb/test/crund/scripts/mycrundjava.sh storage/ndb/test/crund/scripts/mytestcxx.sh => storage/ndb/test/crund/scripts/mycrundcxx.sh storage/ndb/test/crund/scripts/mytests.sh => storage/ndb/test/crund/scripts/mycrund.sh modified: storage/ndb/test/crund/scripts/start_ndb.sh storage/ndb/test/crund/scripts/mycrundjava.sh storage/ndb/test/crund/scripts/mycrund.sh === renamed file 'storage/ndb/test/crund/scripts/mytests.sh' => 'storage/ndb/test/crund/scripts/mycrund.sh' --- a/storage/ndb/test/crund/scripts/mytests.sh 2010-09-27 05:31:17 +0000 +++ b/storage/ndb/test/crund/scripts/mycrund.sh 2011-01-11 16:11:00 +0000 @@ -2,8 +2,10 @@ #for f in run.ndbapi.opt run.ndbjtie.opt run.clusterj.opt run.mysql.opt run.openjpa.mysql.opt run.openjpa.clusterj.opt ; do #for f in run.ndbapi.opt run.ndbjtie.opt run.clusterj.opt run.mysql.opt ; do -for f in run.ndbapi.opt ; do +#for f in run.ndbjtie.opt ; do +#for f in run.ndbapi.opt ; do +for f in run.clusterj.opt ; do echo testing $f - ./mytest.sh ant $f + ./mycrundjava.sh $f mv -v results/xxx results/xxx_$f done === renamed file 'storage/ndb/test/crund/scripts/mytestcxx.sh' => 'storage/ndb/test/crund/scripts/mycrundcxx.sh' === renamed file 'storage/ndb/test/crund/scripts/mytest.sh' => 'storage/ndb/test/crund/scripts/mycrundjava.sh' --- a/storage/ndb/test/crund/scripts/mytest.sh 2010-09-27 05:31:17 +0000 +++ b/storage/ndb/test/crund/scripts/mycrundjava.sh 2011-01-11 16:11:00 +0000 @@ -1,5 +1,5 @@ #!/bin/bash -# usage: +# usage: touch out.txt echo "" >> out.txt 2>&1 @@ -13,9 +13,10 @@ iostat 5 > iostat5.txt 2>&1 & #vmstat 5 > vmstat5.txt 2>&1 & pid=$! echo "" >> out.txt 2>&1 -( cd .. ; $1 $2 ) >> out.txt 2>&1 +( cd .. ; ant $1 ) >> out.txt 2>&1 mkdir -p results/xxx mv -v [a-z]*.txt results/xxx +mv -v ../log*.txt results/xxx cp -v ../*.properties results/xxx cp -v ../build.xml results/xxx cp -v ../config.ini results/xxx === added file 'storage/ndb/test/crund/scripts/mytwscxx.sh' --- a/storage/ndb/test/crund/scripts/mytwscxx.sh 1970-01-01 00:00:00 +0000 +++ b/storage/ndb/test/crund/scripts/mytwscxx.sh 2011-01-11 16:11:00 +0000 @@ -0,0 +1,24 @@ +#!/bin/bash +# usage: no args/options + +touch out.txt +echo "" >> out.txt 2>&1 +hwprefs -v cpu_count >> out.txt 2>&1 +echo "" >> out.txt 2>&1 +./restart_cluster.sh >> out.txt 2>&1 +echo "" >> out.txt 2>&1 +./load_shema.sh >> out.txt 2>&1 +iostat 5 > iostat5.txt 2>&1 & +#vmstat 5 > vmstat5.txt 2>&1 & +pid=$! +echo "" >> out.txt 2>&1 +( cd ../tws/tws_cpp/ ; make run.driver ) >> out.txt 2>&1 +mkdir -p results/xxx +mv -v [a-z]*.txt results/xxx +mv -v ../tws/tws_cpp/log*.txt results/xxx +cp -v ../tws/*.properties results/xxx +cp -v ../config.ini results/xxx +cp -v ../my.cnf results/xxx +mv -v results/xxx results/xxx_tws_cpp +sleep 6 +kill -9 $pid === added file 'storage/ndb/test/crund/scripts/mytwsjava.sh' --- a/storage/ndb/test/crund/scripts/mytwsjava.sh 1970-01-01 00:00:00 +0000 +++ b/storage/ndb/test/crund/scripts/mytwsjava.sh 2011-01-11 16:11:00 +0000 @@ -0,0 +1,26 @@ +#!/bin/bash +# usage: no args/options + +touch out.txt +echo "" >> out.txt 2>&1 +hwprefs -v cpu_count >> out.txt 2>&1 +echo "" >> out.txt 2>&1 +./restart_cluster.sh >> out.txt 2>&1 +echo "" >> out.txt 2>&1 +./load_shema.sh >> out.txt 2>&1 +iostat 5 > iostat5.txt 2>&1 & +#vmstat 5 > vmstat5.txt 2>&1 & +pid=$! +echo "" >> out.txt 2>&1 +( cd ../tws/tws_java/ ; ant run ) >> out.txt 2>&1 +mkdir -p results/xxx +mv -v [a-z]*.txt results/xxx +mv -v ../tws/tws_java/log*.txt results/xxx +cp -v ../tws/tws_java/nbproject/configs/*.properties results/xxx +cp -v ../tws/tws_java/nbproject/private/*.properties results/xxx +cp -v ../tws/*.properties results/xxx +cp -v ../config.ini results/xxx +cp -v ../my.cnf results/xxx +mv -v results/xxx results/xxx_tws_java +sleep 6 +kill -9 $pid === modified file 'storage/ndb/test/crund/scripts/start_ndb.sh' --- a/storage/ndb/test/crund/scripts/start_ndb.sh 2010-09-27 05:31:17 +0000 +++ b/storage/ndb/test/crund/scripts/start_ndb.sh 2011-01-11 16:11:00 +0000 @@ -19,6 +19,10 @@ echo echo start ndbd... ( cd "$mylogdir" ; "$MYSQL_LIBEXEC/ndbd" --initial ) +#echo +#echo start ndbd... +#( cd "$mylogdir" ; "$MYSQL_LIBEXEC/ndbd" --initial ) + # need some extra time for ((i=0; i<1; i++)) ; do echo "." ; sleep 1; done --===============0069680194== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.zaun@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@stripped # target_branch: file:///Users/mz/mysql/ndb-7.1-opt64/ # testament_sha1: a7ec8f789010604626269b57f7cd9192f135c73a # timestamp: 2011-01-11 08:11:07 -0800 # base_revision_id: martin.zaun@stripped\ # ad24m3ud38f9eu32 # # Begin bundle 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 Q1dZpug= --===============0069680194==--