diff options
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/test/run-test/conf-daily-basic-dl145a.txt | 4 | ||||
| -rwxr-xr-x | ndb/test/run-test/make-config.sh | 10 | ||||
| -rwxr-xr-x | ndb/test/run-test/ndb-autotest.sh | 21 |
3 files changed, 20 insertions, 15 deletions
diff --git a/ndb/test/run-test/conf-daily-basic-dl145a.txt b/ndb/test/run-test/conf-daily-basic-dl145a.txt index a7fc801498e..101d5e4b221 100644 --- a/ndb/test/run-test/conf-daily-basic-dl145a.txt +++ b/ndb/test/run-test/conf-daily-basic-dl145a.txt @@ -1,5 +1,5 @@ baseport: 16000 -basedir: /space/autotest +basedir: /home/ndbdev/autotest/run mgm: CHOOSE_host1 ndb: CHOOSE_host2 CHOOSE_host3 api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 @@ -11,7 +11,7 @@ DataMemory: 300M BackupMemory: 64M MaxNoOfConcurrentScans: 100 DataDir: . -FileSystemPath: /space/autotest/run +FileSystemPath: /home/ndbdev/autotest/run [MGM DEFAULT] PortNumber: 14000 diff --git a/ndb/test/run-test/make-config.sh b/ndb/test/run-test/make-config.sh index 8f9b93e28ca..1321ce4e9f0 100755 --- a/ndb/test/run-test/make-config.sh +++ b/ndb/test/run-test/make-config.sh @@ -5,6 +5,7 @@ basedir="" proc_no=1 node_id=1 +d_file=/tmp/d.$$ dir_file=/tmp/dirs.$$ config_file=/tmp/config.$$ cluster_file=/tmp/cluster.$$ @@ -74,9 +75,13 @@ do else cnf=/dev/null fi - ;; - *) echo $line >> $cnf + line="";; + *) echo $line >> $cnf; line="";; esac + if [ "$line" ] + then + echo $line >> $d_file + fi done cat $dir_file | xargs mkdir -p @@ -92,4 +97,5 @@ for i in `find . -type d -name '*.ndb_mgmd'` cp $config_file $i/config.ini done +mv $d_file d.txt rm -f $config_file $dir_file $cluster_file diff --git a/ndb/test/run-test/ndb-autotest.sh b/ndb/test/run-test/ndb-autotest.sh index 5eb9498e878..596bfea63a7 100755 --- a/ndb/test/run-test/ndb-autotest.sh +++ b/ndb/test/run-test/ndb-autotest.sh @@ -1,7 +1,7 @@ #!/bin/sh save_args=$* -VERSION="ndb-autotest.sh version 1.02" +VERSION="ndb-autotest.sh version 1.03" DATE=`date '+%Y-%m-%d'` export DATE @@ -136,7 +136,7 @@ if [ "$deploy" ] then for i in $hosts do - rsync -v -a --delete --force --ignore-errors $run_dir/ $i:$run_dir + rsync -a --delete --force --ignore-errors $run_dir/ $i:$run_dir ok=$? if [ $ok -ne 0 ] then @@ -177,7 +177,7 @@ choose(){ } choose_conf(){ - host=`uname -n` + host=`hostname -s` if [ -f $test_dir/conf-$1-$host.txt ] then echo "$test_dir/conf-$1-$host.txt" @@ -203,14 +203,14 @@ start(){ p2=`pwd` cd .. tar cfz /tmp/res.$$.tgz `basename $p2`/$DATE - scp /tmp/res.$$.tgz $result_host:$result_path/tmp/res.$DATE.`uname -n`.$$.tgz + scp /tmp/res.$$.tgz $result_host:$result_path/res.$DATE.`hostname -s`.$$.tgz rm -f /tmp/res.$$.tgz } count_hosts(){ grep "CHOOSE_host" $1 | - awk '{for(i=1; i<=NF;i++) if(match($i, "CHOOSE_host") > 0) print $i;}' | - wc -l + awk '{for(i=1; i<=NF;i++) if(match($i, "CHOOSE_host") > 0) print $i;}' | + | sort | uniq | wc -l } p=`pwd` @@ -235,13 +235,12 @@ do break; fi - run_hosts=`echo $avail_hosts| awk '{for(i=1;i<='$count';i++)print $i;}'` - - choose $conf $run_hosts > $run_dir/d.txt - (cd $run_dir; $mkconfig d.txt ) + run_hosts=`echo $avail_hosts|awk '{for(i=1;i<='$count';i++)print $i;}'` echo $run_hosts >> /tmp/filter_hosts.$$ - + cd $run_dir + choose $conf $run_hosts > d.tmp + $mkconfig d.tmp start $dir-mysql-$clone-$target $dir $res_dir & done cd $p |