From a7a2db66cc45621be67acf43e1f0a127e7746329 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Mar 2006 10:30:36 +0100 Subject: [PATCH 1/3] Make mysql-test-run.pl restore the db(s) to a known state before continuing after test case failure mysql-test/mysql-test-run.pl: Take a snapshot of the data dirs just after all db's have been installed and usedthat snasphot to restore the db(s) to a known state after a test case has failed. Thus avoiding subsequent test cases to fail because of previous test failures. --- mysql-test/mysql-test-run.pl | 147 ++++++++++++++++++++++++++--------- 1 file changed, 110 insertions(+), 37 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f56d66365c9..a4a71c20012 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -154,6 +154,7 @@ our $path_charsetsdir; our $path_client_bindir; our $path_language; our $path_timefile; +our $path_snapshot; our $path_manager_log; # Used by mysqldadmin our $path_slave_load_tmpdir; # What is this?! our $path_mysqltest_log; @@ -308,10 +309,12 @@ our $opt_with_ndbcluster; our $exe_ndb_mgm; our $path_ndb_tools_dir; -our $path_ndb_backup_dir; +our $path_ndb_data_dir; our $file_ndb_testrun_log; our $flag_ndb_status_ok= 1; +our @data_dir_lst; + ###################################################################### # # Function declarations @@ -388,9 +391,10 @@ sub main () { { kill_and_cleanup(); mysql_install_db(); - -# mysql_loadstd(); FIXME copying from "std_data" .frm and -# .MGR but there are none?! + if ( $opt_force ) + { + save_installed_db(); + } } } @@ -949,6 +953,22 @@ sub command_line_setup () { $path_timefile= "$opt_vardir/log/mysqltest-time"; $path_mysqltest_log= "$opt_vardir/log/mysqltest.log"; + + $path_snapshot= "$opt_tmpdir/snapshot_$opt_master_myport/"; + + # Make a list of all data_dirs + @data_dir_lst = ( + $master->[0]->{'path_myddir'}, + $master->[1]->{'path_myddir'}, + $slave->[0]->{'path_myddir'}, + $slave->[1]->{'path_myddir'}, + $slave->[2]->{'path_myddir'}); + + foreach my $instance (@{$instance_manager->{'instances'}}) + { + push(@data_dir_lst, $instance->{'path_datadir'}); + } + } @@ -1086,8 +1106,7 @@ sub executable_setup () { $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld; $exe_slave_mysqld= $exe_slave_mysqld || $exe_mysqld; - $path_ndb_backup_dir= - "$opt_vardir/ndbcluster-$opt_ndbcluster_port"; + $path_ndb_data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port"; $file_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log"; } @@ -1265,21 +1284,7 @@ sub kill_and_cleanup () { mkpath("$opt_vardir/tmp"); mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp"; - # FIXME do we really need to create these all, or are they - # created for us when tables are created? - - my @data_dir_lst = ( - $master->[0]->{'path_myddir'}, - $master->[1]->{'path_myddir'}, - $slave->[0]->{'path_myddir'}, - $slave->[1]->{'path_myddir'}, - $slave->[2]->{'path_myddir'}); - - foreach my $instance (@{$instance_manager->{'instances'}}) - { - push(@data_dir_lst, $instance->{'path_datadir'}); - } - + # Remove old and create new data dirs foreach my $data_dir (@data_dir_lst) { rmtree("$data_dir"); @@ -2024,10 +2029,9 @@ sub run_testcase ($) { report_failure_and_restart($tinfo); } # Save info from this testcase run to mysqltest.log + my $testcase_log= mtr_fromfile($path_timefile) if -f $path_timefile; mtr_tofile($path_mysqltest_log,"CURRENT TEST $tname\n"); - my $testcase_log= mtr_fromfile($path_timefile); - mtr_tofile($path_mysqltest_log, - $testcase_log); + mtr_tofile($path_mysqltest_log, $testcase_log); } # ---------------------------------------------------------------------- @@ -2041,6 +2045,76 @@ sub run_testcase ($) { } } +sub copy_dir($$) { + my $from_dir= shift; + my $to_dir= shift; + + mkpath("$to_dir"); + opendir(DIR, "$from_dir") + or mtr_error("Can't find $from_dir$!"); + for(readdir(DIR)) { + next if "$_" eq "." or "$_" eq ".."; + if ( -d "$from_dir/$_" ) + { + copy_dir("$from_dir/$_", "$to_dir/$_"); + next; + } + copy("$from_dir/$_", "$to_dir/$_"); + } + closedir(DIR); + +} + +# +# Save a snapshot of the installed test db(s) +# I.e take a snapshot of the var/ dir +# +sub save_installed_db () { + + mtr_report("Saving snapshot of installed databases"); + rmtree($path_snapshot); + + foreach my $data_dir (@data_dir_lst) + { + my $name= basename($data_dir); + print "$data_dir\n"; + copy_dir("$data_dir", "$path_snapshot/$name"); + } +} + +# +# Restore snapshot of the installed test db(s) +# if the snapshot exists +# +sub restore_installed_db () { + + if ( -d $path_snapshot) + { + kill_running_server (); + + mtr_report("Restoring snapshot of databases"); + + foreach my $data_dir (@data_dir_lst) + { + my $name= basename($data_dir); + print "$data_dir\n"; + rmtree("$data_dir"); + copy_dir("$path_snapshot/$name", "$data_dir"); + } + if ($opt_with_ndbcluster) + { + # Remove the ndb_*_fs dirs, forcing a clean start of ndb + rmtree("$path_ndb_data_dir/ndb_1_fs"); + rmtree("$path_ndb_data_dir/ndb_2_fs"); + } + } + else + { + # No snapshot existed, just stop all processes + stop_masters_slaves(); + } +} + sub report_failure_and_restart ($) { my $tinfo= shift; @@ -2048,26 +2122,24 @@ sub report_failure_and_restart ($) { mtr_report_test_failed($tinfo); mtr_show_failed_diff($tinfo->{'name'}); print "\n"; - if ( ! $opt_force ) + if ( $opt_force ) { - my $test_mode= join(" ", @::glob_test_mode) || "default"; - print "Aborting: $tinfo->{'name'} failed in $test_mode mode. "; - print "To continue, re-run with '--force'.\n"; - if ( ! $opt_gdb and ! $glob_use_running_server and - ! $opt_ddd and ! $glob_use_embedded_server ) - { - stop_masters_slaves(); - } - mtr_exit(1); + # Restore the snapshot of the installed test db + restore_installed_db(); + print "Resuming Tests\n\n"; + return; } - # FIXME always terminate on failure?! + my $test_mode= join(" ", @::glob_test_mode) || "default"; + print "Aborting: $tinfo->{'name'} failed in $test_mode mode. "; + print "To continue, re-run with '--force'.\n"; if ( ! $opt_gdb and ! $glob_use_running_server and ! $opt_ddd and ! $glob_use_embedded_server ) { stop_masters_slaves(); } - print "Resuming Tests\n\n"; + mtr_exit(1); + } @@ -2758,7 +2830,8 @@ sub run_mysqltest ($) { $ENV{'NDB_STATUS_OK'}= $flag_ndb_status_ok; $ENV{'NDB_MGM'}= $exe_ndb_mgm; - $ENV{'NDB_BACKUP_DIR'}= $path_ndb_backup_dir; + $ENV{'NDB_BACKUP_DIR'}= $path_ndb_data_dir; + $ENV{'NDB_DATA_DIR'}= $path_ndb_data_dir; $ENV{'NDB_TOOLS_DIR'}= $path_ndb_tools_dir; $ENV{'NDB_TOOLS_OUTPUT'}= $file_ndb_testrun_log; $ENV{'NDB_CONNECTSTRING'}= $opt_ndbconnectstring; From 9f4f77ab9035342bf5da39e53f8f1e41568ef09f Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Mar 2006 11:06:14 +0100 Subject: [PATCH 2/3] Remove printouts mysql-test/mysql-test-run.pl: Remove extra printouts --- mysql-test/mysql-test-run.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a4a71c20012..6d03529d509 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2077,7 +2077,6 @@ sub save_installed_db () { foreach my $data_dir (@data_dir_lst) { my $name= basename($data_dir); - print "$data_dir\n"; copy_dir("$data_dir", "$path_snapshot/$name"); } } @@ -2097,7 +2096,6 @@ sub restore_installed_db () { foreach my $data_dir (@data_dir_lst) { my $name= basename($data_dir); - print "$data_dir\n"; rmtree("$data_dir"); copy_dir("$path_snapshot/$name", "$data_dir"); } From 9865f74f173f85da93779f4a5c74affee2730219 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Mar 2006 11:30:16 +0100 Subject: [PATCH 3/3] Remove also slave clusters data on restart after test failure mysql-test/mysql-test-run.pl: Setup path the slave clusters data dir Remove slave clusters data dir on restart after test case failure --- mysql-test/mysql-test-run.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index de6476b696c..441a23d774c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -322,6 +322,7 @@ our $opt_ndb_extra_test= 0; our $exe_ndb_mgm; our $path_ndb_tools_dir; our $path_ndb_data_dir; +our $path_ndb_slave_data_dir; our $file_ndb_testrun_log; our $flag_ndb_status_ok= 1; our $flag_ndb_slave_status_ok= 1; @@ -1148,6 +1149,7 @@ sub executable_setup () { $exe_slave_mysqld= $exe_slave_mysqld || $exe_mysqld; $path_ndb_data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port"; + $path_ndb_slave_data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port_slave"; $file_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log"; } @@ -2321,6 +2323,12 @@ sub restore_installed_db () { # Remove the ndb_*_fs dirs, forcing a clean start of ndb rmtree("$path_ndb_data_dir/ndb_1_fs"); rmtree("$path_ndb_data_dir/ndb_2_fs"); + + if ( $opt_with_ndbcluster_slave ) + { + # Remove also the ndb_*_fs dirs for slave cluster + rmtree("$path_ndb_slave_data_dir/ndb_1_fs"); + } } } else