database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Improve 'run_testcase_need_master_restart' to require restart if master is not already started

Browse Source 
Improve 'run_testcase_need_slave_restart' to detect if a slave restart really is necessary. 
So far all rpl test requires a slave restart, but for all other tests it can be skipped
Improve the sort order used by --reorder
This commit is contained in:
msvensson@neptunus.(none)
2006-10-06 11:23:19 +02:00
parent f638be87cb
commit 22f1cc58c2
2 changed files with 51 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mysql-test/lib/mtr_cases.pl
View File

@ -164,31 +164,36 @@ sub collect_test_cases ($) {
# Make a mapping of test name to a string that represents how that test # Make a mapping of test name to a string that represents how that test
# should be sorted among the other tests. Put the most important criterion # should be sorted among the other tests. Put the most important criterion
# first, then a sub-criterion, then sub-sub-criterion, et c. # first, then a sub-criterion, then sub-sub-criterion, et c.
foreach $tinfo (@$cases) foreach $tinfo (@$cases)
{ {
my @this_criteria = (); my @this_criteria = ();
#
# Append the criteria for sorting, in order of importance. # Append the criteria for sorting, in order of importance.
push(@this_criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~"); # Ending with "~" makes empty sort later than filled #
push(@this_criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0")); push(@this_criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0"));
push(@this_criteria, "restart=" . ($tinfo->{'master_restart'} ? "1" : "0")); push(@this_criteria, "restart=" . ($tinfo->{'master_restart'} ? "1" : "0"));
push(@this_criteria, "big_test=" . ($tinfo->{'big_test'} ? "1" : "0")); # Group test with similar options together.
push(@this_criteria, join("|", sort keys %{$tinfo})); # Group similar things together. The values may differ substantially. FIXME? # Ending with "~" makes empty sort later than filled
push(@this_criteria, $tinfo->{'name'}); # Finally, order by the name push(@this_criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~");
# Finally, order by the name
push(@this_criteria, $tinfo->{'name'});
$sort_criteria{$tinfo->{"name"}} = join(" ", @this_criteria); $sort_criteria{$tinfo->{"name"}} = join(" ", @this_criteria);
} }
@$cases = sort { $sort_criteria{$a->{"name"}} cmp $sort_criteria{$b->{"name"}}; } @$cases; @$cases = sort { $sort_criteria{$a->{"name"}} cmp $sort_criteria{$b->{"name"}}; } @$cases;
### For debugging the sort-order ### For debugging the sort-order
# foreach $tinfo (@$cases) foreach $tinfo (@$cases)
# { {
# print $sort_criteria{$tinfo->{"name"}}; print $sort_criteria{$tinfo->{"name"}};
# print " -> \t"; print " -> \t";
# print $tinfo->{"name"}; print $tinfo->{"name"};
# print "\n"; print "\n";
# } }
} }
return $cases; return $cases;

83
mysql-test/mysql-test-run.pl
View File

@ -3522,6 +3522,11 @@ sub run_testcase_need_master_restart($)
join(" ", @{$tinfo->{'master_opt'}}) . "' != '" . join(" ", @{$tinfo->{'master_opt'}}) . "' != '" .
join(" ", @{$master->[0]->{'start_opts'}}) . "'" ); join(" ", @{$master->[0]->{'start_opts'}}) . "'" );
} }
elsif( ! $master->[0]->{'pid'} )
{
$do_restart= 1;
mtr_verbose("Restart because: master is not started");
}
return $do_restart; return $do_restart;
} }
@ -3533,57 +3538,35 @@ sub run_testcase_need_slave_restart($)
# We try to find out if we are to restart the slaves # We try to find out if we are to restart the slaves
my $do_slave_restart= 0; # Assumes we don't have to my $do_slave_restart= 0; # Assumes we don't have to
# FIXME only restart slave when necessary if ( $max_slave_num == 0)
$do_slave_restart= 1; {
mtr_verbose("No testcase use slaves, no slave restarts");
}
else
{
# if ( ! $slave->[0]->{'pid'} ) # Check if any slave is currently started
# { my $any_slave_started= 0;
# # mtr_verbose("Slave not started, no need to check slave restart"); foreach my $mysqld (@{$slave})
# } {
# elsif ( $do_restart ) if ( $mysqld->{'pid'} )
# { {
# $do_slave_restart= 1; # Always restart if master restart $any_slave_started= 1;
# mtr_verbose("Restart slave because: Master restart"); last;
# } }
# elsif ( $tinfo->{'slave_sh'} ) }
# {
# $do_slave_restart= 1; # Always restart if script to run if ($any_slave_started)
# mtr_verbose("Restart slave because: Always restart if script to run"); {
# } mtr_verbose("Any slave is started, need to restart");
# elsif ( ! $opt_skip_ndbcluster_slave and $do_slave_restart= 1;
# $tinfo->{'ndb_test'} == 0 and }
# $clusters->[1]->{'pid'} != 0 ) elsif ( $tinfo->{'slave_num'} )
# { {
# $do_slave_restart= 1; # Restart without slave cluster mtr_verbose("Test need slave, check for restart");
# mtr_verbose("Restart slave because: Test does not need slave cluster"); $do_slave_restart= 1;
# } }
# elsif ( ! $opt_with_ndbcluster_slave and }
# $tinfo->{'ndb_test'} == 1 and
# $clusters->[1]->{'pid'} == 0 )
# {
# $do_slave_restart= 1; # Restart with slave cluster
# mtr_verbose("Restart slave because: Test need slave cluster");
# }
# elsif ( $tinfo->{'slave_restart'} )
# {
# $do_slave_restart= 1;
# mtr_verbose("Restart slave because: slave_restart");
# }
# elsif ( $slave->[0]->{'running_slave_is_special'} )
# {
# $do_slave_restart= 1;
# mtr_verbose("Restart slave because: running_slave_is_special");
# }
# # Check that running slave was started with same options
# # as the current test requires
# elsif (! mtr_same_opts($slave->[0]->{'start_opts'},
# $tinfo->{'slave_opt'}) )
# {
# $do_slave_restart= 1;
# mtr_verbose("Restart slave because: running with different options '" .
# join(" ", @{$tinfo->{'slave_opt'}}) . "' != '" .
# join(" ", @{$slave->[0]->{'start_opts'}}) . "'" );
# }
return $do_slave_restart; return $do_slave_restart;