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

Clean up de_before_start_master/slave

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2006-10-04 23:05:12 +02:00
parent c29427ec3c
commit c243c7d866
1 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,8 +360,8 @@ sub run_testcase_stop_servers ($$$);
sub run_testcase_start_servers ($); sub run_testcase_start_servers ($);
sub run_testcase_check_skip_test($); sub run_testcase_check_skip_test($);
sub report_failure_and_restart ($); sub report_failure_and_restart ($);
sub do_before_start_master ($$); sub do_before_start_master ($);
sub do_before_start_slave ($$); sub do_before_start_slave ($);
sub ndbd_start ($$$); sub ndbd_start ($$$);
sub ndb_mgmd_start ($); sub ndb_mgmd_start ($);
sub mysqld_start ($$$); sub mysqld_start ($$$);
@ -2866,24 +2866,17 @@ sub report_failure_and_restart ($) {
############################################################################## ##############################################################################
# The embedded server needs the cleanup so we do some of the start work sub do_before_start_master ($) {
# but stop before actually running mysqld or anything. my ($tinfo)= @_;
sub do_before_start_master ($$) {
my $tname= shift; my $tname= $tinfo->{'name'};
my $init_script= shift; my $init_script= $tinfo->{'master_sh'};
# FIXME what about second master..... # FIXME what about second master.....
# Remove stale binary logs except for 2 tests which need them FIXME here???? foreach my $bin ( glob("$opt_vardir/log/master*-bin*") )
if ( $tname ne "rpl_crash_binlog_ib_1b" and
$tname ne "rpl_crash_binlog_ib_2b" and
$tname ne "rpl_crash_binlog_ib_3b")
{ {
# FIXME we really want separate dir for binlogs unlink($bin);
foreach my $bin ( glob("$opt_vardir/log/master*-bin*") )
{
unlink($bin);
}
} }
# FIXME only remove the ones that are tied to this master # FIXME only remove the ones that are tied to this master
@ -2903,31 +2896,23 @@ sub do_before_start_master ($$) {
# mtr_warning("$init_script exited with code $ret"); # mtr_warning("$init_script exited with code $ret");
} }
} }
# for gcov FIXME needed? If so we need more absolute paths
# chdir($glob_basedir);
} }
sub do_before_start_slave ($$) { sub do_before_start_slave ($) {
my $tname= shift; my ($tinfo)= @_;
my $init_script= shift;
# Remove stale binary logs and old master.info files my $tname= $tinfo->{'name'};
# except for too tests which need them my $init_script= $tinfo->{'master_sh'};
if ( $tname ne "rpl_crash_binlog_ib_1b" and
$tname ne "rpl_crash_binlog_ib_2b" and foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") )
$tname ne "rpl_crash_binlog_ib_3b" )
{ {
# FIXME we really want separate dir for binlogs unlink($bin);
foreach my $bin ( glob("$opt_vardir/log/slave*-bin*") )
{
unlink($bin);
}
# FIXME really master?!
unlink("$slave->[0]->{'path_myddir'}/master.info");
unlink("$slave->[0]->{'path_myddir'}/relay-log.info");
} }
unlink("$slave->[0]->{'path_myddir'}/master.info");
unlink("$slave->[0]->{'path_myddir'}/relay-log.info");
# Run slave initialization shell script if one exists # Run slave initialization shell script if one exists
if ( $init_script ) if ( $init_script )
{ {
@ -3687,7 +3672,7 @@ sub run_testcase_start_servers($) {
if ( !$master->[0]->{'pid'} ) if ( !$master->[0]->{'pid'} )
{ {
# Master mysqld is not started # Master mysqld is not started
do_before_start_master($tname,$tinfo->{'master_sh'}); do_before_start_master($tinfo);
mysqld_start($master->[0],$tinfo->{'master_opt'},[]); mysqld_start($master->[0],$tinfo->{'master_opt'},[]);
@ -3752,7 +3737,7 @@ sub run_testcase_start_servers($) {
restore_slave_databases($tinfo->{'slave_num'}); restore_slave_databases($tinfo->{'slave_num'});
do_before_start_slave($tname,$tinfo->{'slave_sh'}); do_before_start_slave($tinfo);
if ( ! $opt_skip_ndbcluster_slave and if ( ! $opt_skip_ndbcluster_slave and
!$clusters->[1]->{'pid'} and !$clusters->[1]->{'pid'} and