From: Date: December 11 2008 2:46pm Subject: bzr commit into mysql-5.1 branch (jonas:2772) List-Archive: http://lists.mysql.com/commits/61357 Message-Id: <20081211134646.2E3747CCC0@perch.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/jonas/src/telco-6.2/ 2772 Jonas Oreland 2008-12-11 ndb - autotest - fourth attempt at upgrade-testing added: storage/ndb/test/run-test/conf-upgrade.cnf storage/ndb/test/run-test/upgrade-tests.txt modified: storage/ndb/test/run-test/Makefile.am storage/ndb/test/run-test/autotest-boot.sh storage/ndb/test/run-test/autotest-run.sh storage/ndb/test/run-test/files.cpp storage/ndb/test/run-test/main.cpp storage/ndb/test/run-test/setup.cpp === modified file 'storage/ndb/test/run-test/Makefile.am' --- a/storage/ndb/test/run-test/Makefile.am 2008-08-23 20:29:50 +0000 +++ b/storage/ndb/test/run-test/Makefile.am 2008-12-11 13:46:36 +0000 @@ -23,7 +23,8 @@ include $(top_srcdir)/storage/ndb/config test_PROGRAMS = atrt test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \ conf-ndbmaster.cnf \ - conf-dl145a.cnf test-tests.txt conf-test.cnf db.sql + conf-dl145a.cnf test-tests.txt conf-test.cnf db.sql \ + conf-upgrade.cnf upgrade-tests.txt test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \ atrt-clear-result.sh autotest-run.sh atrt-backtrace.sh === modified file 'storage/ndb/test/run-test/autotest-boot.sh' --- a/storage/ndb/test/run-test/autotest-boot.sh 2008-12-10 15:18:06 +0000 +++ b/storage/ndb/test/run-test/autotest-boot.sh 2008-12-11 13:46:36 +0000 @@ -166,9 +166,9 @@ fi if [ -z "$tag1" ] then - dst_place1=${build_dir}/clone-$clone1-$DATE.$$ + dst_place1=${build_dir}/clone1-$clone1-$DATE.$$ else - dst_place1=${build_dir}/clone-$tag1-$DATE.$$ + dst_place1=${build_dir}/clone1-$tag1-$DATE.$$ extra_args="$extra_args --clone1=$tag1" extra_clone1="-r$tag1" fi @@ -205,11 +205,11 @@ then make install else cd $dst_place0 - BUILD/compile-ndb-autotest --prefix=$install_dir0 + BUILD/compile-ndb-autotest --with-debug=full --prefix=$install_dir0 make install cd $dst_place1 - BUILD/compile-ndb-autotest --prefix=$install_dir1 + BUILD/compile-ndb-autotest --with-debug=full --prefix=$install_dir1 make install fi fi === modified file 'storage/ndb/test/run-test/autotest-run.sh' --- a/storage/ndb/test/run-test/autotest-run.sh 2008-12-10 15:18:06 +0000 +++ b/storage/ndb/test/run-test/autotest-run.sh 2008-12-11 13:46:36 +0000 @@ -247,18 +247,22 @@ cd $run_dir choose $conf $hosts > d.tmp.$$ sed -e s,CHOOSE_dir,"$run_dir/run",g < d.tmp.$$ > my.cnf +prefix="--prefix=$install_dir0" +if [ "$install_dir1" ] +then + prefix="$prefix --prefix1=$install_dir1" +fi + + # Setup configuration -$atrt Cdq my.cnf +$atrt Cdq $prefix my.cnf # Start... args="" args="--report-file=report.txt" args="$args --log-file=log.txt" args="$args --testcase-file=$test_dir/$RUN-tests.txt" -if [ "$install_dir1" ] -then - args="$args --prefix=$install_dir0 --prefix1=$install_dir1" -fi +args="$args $prefix" $atrt $args my.cnf # Make tar-ball === added file 'storage/ndb/test/run-test/conf-upgrade.cnf' --- a/storage/ndb/test/run-test/conf-upgrade.cnf 1970-01-01 00:00:00 +0000 +++ b/storage/ndb/test/run-test/conf-upgrade.cnf 2008-12-11 13:46:36 +0000 @@ -0,0 +1,27 @@ +[atrt] +basedir = CHOOSE_dir +baseport = 14000 +clusters = .4node +mysqld = CHOOSE_host1 + +[ndb_mgmd] + +[mysqld] +skip-innodb +loose-skip-bdb + +[cluster_config.4node] +ndb_mgmd = CHOOSE_host1 +ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host2,CHOOSE_host3 +ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1 + +NoOfReplicas = 2 +IndexMemory = 50M +DataMemory = 100M +BackupMemory = 64M +MaxNoOfConcurrentScans = 100 +MaxNoOfSavedMessages= 1000 +SendBufferMemory = 2M +NoOfFragmentLogFiles = 4 +FragmentLogFileSize = 64M + === modified file 'storage/ndb/test/run-test/files.cpp' --- a/storage/ndb/test/run-test/files.cpp 2008-08-23 20:29:50 +0000 +++ b/storage/ndb/test/run-test/files.cpp 2008-12-11 13:46:36 +0000 @@ -116,6 +116,11 @@ setup_files(atrt_config& config, int set BaseString mycnf; mycnf.assfmt("%s/my.cnf", g_basedir); + if (!create_directory(g_basedir)) + { + return false; + } + if (mycnf != g_my_cnf) { struct stat sbuf; === modified file 'storage/ndb/test/run-test/main.cpp' --- a/storage/ndb/test/run-test/main.cpp 2008-09-25 10:21:14 +0000 +++ b/storage/ndb/test/run-test/main.cpp 2008-12-11 13:46:36 +0000 @@ -1208,28 +1208,38 @@ setup_hosts(atrt_config& config){ return true; } +static +bool +do_rsync(const char *dir, const char *dst) +{ + BaseString tmp = g_setup_progname; + tmp.appfmt(" %s %s/ %s", dst, dir, dir); + + g_logger.info("rsyncing %s to %s", dir, dst); + g_logger.debug("system(%s)", tmp.c_str()); + const int r1 = system(tmp.c_str()); + if(r1 != 0) + { + g_logger.critical("Failed to rsync %s to %s", dir, dst); + return false; + } + + return true; +} + bool deploy(atrt_config & config) { for (size_t i = 0; im_hostname.c_str(), - g_prefix, - g_prefix); - - g_logger.info("rsyncing %s to %s", g_prefix, - config.m_hosts[i]->m_hostname.c_str()); - g_logger.debug("system(%s)", tmp.c_str()); - const int r1 = system(tmp.c_str()); - if(r1 != 0) - { - g_logger.critical("Failed to rsync %s to %s", - g_prefix, - config.m_hosts[i]->m_hostname.c_str()); + if (!do_rsync(g_basedir, config.m_hosts[i]->m_hostname.c_str())) + return false; + + if (!do_rsync(g_prefix, config.m_hosts[i]->m_hostname.c_str())) + return false; + + if (g_prefix1 && !do_rsync(g_prefix1, config.m_hosts[i]->m_hostname.c_str())) return false; - } } return true; === modified file 'storage/ndb/test/run-test/setup.cpp' --- a/storage/ndb/test/run-test/setup.cpp 2008-11-27 18:03:09 +0000 +++ b/storage/ndb/test/run-test/setup.cpp 2008-12-11 13:46:36 +0000 @@ -49,14 +49,14 @@ bool setup_config(atrt_config& config, const char* atrt_mysqld) { BaseString tmp(g_clusters); - Vector clusters; - tmp.split(clusters, ","); - + if (atrt_mysqld) { - clusters.push_back(BaseString(".atrt")); + tmp.appfmt(",.atrt"); } - + Vector clusters; + tmp.split(clusters, ","); + bool fqpn = clusters.size() > 1 || g_fqpn; size_t j,k; @@ -131,6 +131,7 @@ setup_config(atrt_config& config, const proc_args[1].value = 0; proc_args[2].value = 0; proc_args[3].value = 0; + proc_args[4].value = atrt_mysqld; } /** @@ -154,10 +155,11 @@ setup_config(atrt_config& config, const /** * Load cluster options */ - - argc = 1; + int argc = 1; + const char * argv[] = { "atrt", 0, 0 }; argv[argc++] = buf.c_str(); const char *groups[] = { "mysql_cluster", 0 }; + char ** tmp = (char**)argv; ret = load_defaults(g_my_cnf, groups, &argc, &tmp); if (ret) === added file 'storage/ndb/test/run-test/upgrade-tests.txt' --- a/storage/ndb/test/run-test/upgrade-tests.txt 1970-01-01 00:00:00 +0000 +++ b/storage/ndb/test/run-test/upgrade-tests.txt 2008-12-11 13:46:36 +0000 @@ -0,0 +1,12 @@ +cmd: testUpgrade +args: -n Upgrade_NR1 +max-time: 600 + +cmd: testUpgrade +args: -n Upgrade_NR1 +max-time: 600 + +cmd: testUpgrade +args: -n Upgrade_NR1 +max-time: 600 +