Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2232 05/05/06 16:41:46 joreland@stripped +7 -0
ndb - autotest
put config files in bk
ndb/test/run-test/conf-daily-sql-ndbmaster.txt
1.1 05/05/06 16:41:44 joreland@stripped +20 -0
ndb/test/run-test/conf-daily-devel-ndbmaster.txt
1.1 05/05/06 16:41:44 joreland@stripped +19 -0
ndb/test/run-test/conf-daily-sql-ndbmaster.txt
1.0 05/05/06 16:41:44 joreland@stripped +0 -0
BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
ndb/test/run-test/conf-daily-devel-ndbmaster.txt
1.0 05/05/06 16:41:44 joreland@stripped +0 -0
BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
ndb/test/run-test/conf-daily-basic-shark.txt
1.1 05/05/06 16:41:43 joreland@stripped +19 -0
ndb/test/run-test/conf-daily-basic-ndbmaster.txt
1.1 05/05/06 16:41:43 joreland@stripped +19 -0
ndb/test/run-test/conf-daily-basic-dl145a.txt
1.1 05/05/06 16:41:43 joreland@stripped +19 -0
ndb/test/run-test/ndb-autotest.sh
1.4 05/05/06 16:41:43 joreland@stripped +26 -7
Check for 5.1 disrectory structure
Add config files to distribution
Remove unpacking for ndb-autotest.sh
ndb/test/run-test/make-config.sh
1.4 05/05/06 16:41:43 joreland@stripped +1 -1
Corrent directory
ndb/test/run-test/conf-daily-basic-shark.txt
1.0 05/05/06 16:41:43 joreland@stripped +0 -0
BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-basic-shark.txt
ndb/test/run-test/conf-daily-basic-ndbmaster.txt
1.0 05/05/06 16:41:43 joreland@stripped +0 -0
BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
ndb/test/run-test/conf-daily-basic-dl145a.txt
1.0 05/05/06 16:41:43 joreland@stripped +0 -0
BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-basic-dl145a.txt
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: joreland
# Host: eel.mysql.com
# Root: /home/jonas/src/mysql-4.1
--- New file ---
+++ ndb/test/run-test/conf-daily-basic-dl145a.txt 05/05/06 16:41:43
baseport: 16000
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3
api: CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
IndexMemory: 100M
DataMemory: 300M
BackupMemory: 64M
MaxNoOfConcurrentScans: 100
DataDir: .
FileSystemPath: /space/autotest/run
[MGM DEFAULT]
PortNumber: 14000
ArbitrationRank: 1
DataDir: .
--- New file ---
+++ ndb/test/run-test/conf-daily-basic-ndbmaster.txt 05/05/06 16:41:43
baseport: 16000
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3 CHOOSE_host2 CHOOSE_host3
api: CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
IndexMemory: 100M
DataMemory: 300M
BackupMemory: 64M
MaxNoOfConcurrentScans: 100
DataDir: .
FileSystemPath: /space/autotest/run
[MGM DEFAULT]
PortNumber: 14000
ArbitrationRank: 1
DataDir: .
--- New file ---
+++ ndb/test/run-test/conf-daily-basic-shark.txt 05/05/06 16:41:43
baseport: 14000
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host1 CHOOSE_host1
api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
IndexMemory: 100M
DataMemory: 300M
BackupMemory: 64M
MaxNoOfConcurrentScans: 100
DataDir: .
FileSystemPath: /space/autotest/run
[MGM DEFAULT]
PortNumber: 14000
ArbitrationRank: 1
DataDir: .
--- New file ---
+++ ndb/test/run-test/conf-daily-devel-ndbmaster.txt 05/05/06 16:41:44
baseport: 16000
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3 CHOOSE_host2 CHOOSE_host3
api: CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
IndexMemory: 100M
DataMemory: 300M
BackupMemory: 64M
MaxNoOfConcurrentScans: 100
DataDir: .
FileSystemPath: /space/autotest/run
[MGM DEFAULT]
PortNumber: 14000
ArbitrationRank: 1
DataDir: .
--- New file ---
+++ ndb/test/run-test/conf-daily-sql-ndbmaster.txt 05/05/06 16:41:44
baseport: 16000
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3
mysqld: CHOOSE_host1 CHOOSE_hosts4
mysql: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts4 CHOOSE_hosts4 CHOOSE_hosts4 CHOOSE_hosts4 CHOOSE_hosts4 CHOOSE_hosts4
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
IndexMemory: 100M
DataMemory: 300M
BackupMemory: 64M
MaxNoOfConcurrentScans: 100
DataDir: .
FileSystemPath: /space/autotest/run
[MGM DEFAULT]
PortNumber: 14000
ArbitrationRank: 1
DataDir: .
--- 1.3/ndb/test/run-test/ndb-autotest.sh Fri May 6 16:14:28 2005
+++ 1.4/ndb/test/run-test/ndb-autotest.sh Fri May 6 16:41:43 2005
@@ -71,8 +71,14 @@
cd $dst_place
rm -rf $run_dir/*
aclocal; autoheader; autoconf; automake
- (cd innobase; aclocal; autoheader; autoconf; automake)
- (cd bdb/dist; sh s_all)
+ if [ -d storage ]
+ then
+ (cd storage/innobase; aclocal; autoheader; autoconf; automake)
+ (cd storage/bdb/dist; sh s_all)
+ else
+ (cd innobase; aclocal; autoheader; autoconf; automake)
+ (cd bdb/dist; sh s_all)
+ fi
eval $configure --prefix=$run_dir
make
make install
@@ -173,6 +179,18 @@
cat $TMP1
rm -f $TMP1
}
+
+choose_conf(){
+ host=`uname -n`
+ if [ -f $test_dir/conf-$1-$host.txt ]
+ then
+ echo "$test_dir/conf-$1-$host.txt"
+ elif [ -f $test_dir/conf-$1.txt ]
+ then
+ echo "$test_dir/conf-$1.txt"
+ fi
+}
+
start(){
rm -rf report.txt result* log.txt
$atrt -v -v -r -R --log-file=log.txt --testcase-file=$test_dir/$2-tests.txt &
@@ -189,8 +207,7 @@
p2=`pwd`
cd ..
tar cfz /tmp/res.$$.tgz `basename $p2`/$DATE
- scp /tmp/res.$$.tgz $result_host:$result_path
- ssh $result_host "cd $result_path && tar xfz res.$$.tgz && rm -f res.$$.tgz"
+ scp /tmp/res.$$.tgz $result_host:$result_path/tmp/res.$DATE.`uname -n`.$$.tgz
rm -f /tmp/res.$$.tgz
}
@@ -202,8 +219,8 @@
run_dir=$base_dir/run-$dir-mysql-$clone-$target
res_dir=$base_dir/result-$dir-mysql-$clone-$target/$DATE
- mkdir -p $res_dir
- rm -rf $res_dir/*
+ mkdir -p $run_dir $res_dir
+ rm -rf $res_dir/* $run_dir/*
count=`grep -c "COMPUTER" $run_dir/1.ndb_mgmd/initconfig.template`
avail_hosts=`filter /tmp/filter_hosts.$$ $hosts`
@@ -216,7 +233,9 @@
fi
run_hosts=`echo $avail_hosts| awk '{for(i=1;i<='$count';i++)print $i;}'`
- choose $run_dir/d.template $run_hosts > $run_dir/d.txt
+ conf=`choose_conf $dir`
+
+ choose $conf $run_hosts > $run_dir/d.txt
(cd $run_dir; $mkconfig d.txt )
echo $run_hosts >> /tmp/filter_hosts.$$
--- 1.3/ndb/test/run-test/make-config.sh Fri May 6 16:14:28 2005
+++ 1.4/ndb/test/run-test/make-config.sh Fri May 6 16:41:43 2005
@@ -33,7 +33,7 @@
node_id=`expr $node_id + 1`
;;
ndb)
- dir="ndb"
+ dir="ndbd"
conf="[ndbd]\nId: $node_id\nHostName: $2\n"
node_id=`expr $node_id + 1`
;;
| Thread |
|---|
| • bk commit into 4.1 tree (joreland:1.2232) | jonas.oreland | 6 May |
