List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:January 11 2011 4:11pm
Subject:bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4016)
View as plain text  
#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: <ant|make> <run.ndbapi|...|run.driver>
+# usage: <run.ndbapi.opt|...>
 
 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
 


Attachment: [text/bzr-bundle] bzr/martin.zaun@oracle.com-20110111161100-44nw7emd3haahayr.bundle
Thread
bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4016) Martin Zaun11 Jan