Skip to content

M
mariadb
Commit 4f0bda6a authored by unknown's avatar unknown
Browse files
Options

Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


storage/ndb/tools/waiter.cpp:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
parents 393c867f 946f0c83
Show whitespace changes
Inline Side-by-side
Showing with 1017 additions and 729 deletions
client/mysqltest.c
View file @ 4f0bda6a
...@@ -2518,7 +2518,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user, ...@@ -2518,7 +2518,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user,
{ {
int con_error= 1; int con_error= 1;
my_bool reconnect= 1; my_bool reconnect= 1;
static int connection_retry_sleep= 2; /* Seconds */ static ulong connection_retry_sleep= 100000; /* Microseconds */
int i; int i;
for (i= 0; i < opt_max_connect_retries; i++) for (i= 0; i < opt_max_connect_retries; i++)
{ {
...@@ -2528,7 +2528,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user, ...@@ -2528,7 +2528,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user,
con_error= 0; con_error= 0;
break; break;
} }
sleep(connection_retry_sleep); my_sleep(connection_retry_sleep);
} }
/* /*
TODO: change this to 0 in future versions, but the 'kill' test relies on TODO: change this to 0 in future versions, but the 'kill' test relies on
...@@ -3298,7 +3298,7 @@ static struct my_option my_long_options[] = ...@@ -3298,7 +3298,7 @@ static struct my_option my_long_options[] =
{"max-connect-retries", OPT_MAX_CONNECT_RETRIES, {"max-connect-retries", OPT_MAX_CONNECT_RETRIES,
"Max number of connection attempts when connecting to server", "Max number of connection attempts when connecting to server",
(gptr*) &opt_max_connect_retries, (gptr*) &opt_max_connect_retries, 0, (gptr*) &opt_max_connect_retries, (gptr*) &opt_max_connect_retries, 0,
GET_INT, REQUIRED_ARG, 5, 1, 10, 0, 0, 0}, GET_INT, REQUIRED_ARG, 500, 1, 10000, 0, 0, 0},
{"password", 'p', "Password to use when connecting to server.", {"password", 'p', "Password to use when connecting to server.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"port", 'P', "Port number to use for connection.", (gptr*) &port, {"port", 'P', "Port number to use for connection.", (gptr*) &port,
......
mysql-test/lib/mtr_process.pl
View file @ 4f0bda6a
...@@ -14,12 +14,17 @@ use POSIX 'WNOHANG'; ...@@ -14,12 +14,17 @@ use POSIX 'WNOHANG';
sub mtr_run ($$$$$$;$); sub mtr_run ($$$$$$;$);
sub mtr_spawn ($$$$$$;$); sub mtr_spawn ($$$$$$;$);
sub mtr_stop_mysqld_servers ($); sub mtr_check_stop_servers ($);
sub mtr_kill_leftovers (); sub mtr_kill_leftovers ();
sub mtr_wait_blocking ($);
sub mtr_record_dead_children (); sub mtr_record_dead_children ();
sub mtr_ndbmgm_start($$);
sub mtr_mysqladmin_start($$$);
sub mtr_exit ($); sub mtr_exit ($);
sub sleep_until_file_created ($$$); sub sleep_until_file_created ($$$);
sub mtr_kill_processes ($); sub mtr_kill_processes ($);
sub mtr_ping_with_timeout($);
sub mtr_ping_port ($);
sub mtr_kill_process ($$$$); sub mtr_kill_process ($$$$);
# static in C # static in C
...@@ -32,7 +37,6 @@ sub spawn_impl ($$$$$$$$); ...@@ -32,7 +37,6 @@ sub spawn_impl ($$$$$$$$);
############################################################################## ##############################################################################
# This function try to mimic the C version used in "netware/mysql_test_run.c" # This function try to mimic the C version used in "netware/mysql_test_run.c"
# FIXME learn it to handle append mode as well, a "new" flag or a "append"
sub mtr_run ($$$$$$;$) { sub mtr_run ($$$$$$;$) {
my $path= shift; my $path= shift;
...@@ -347,49 +351,71 @@ sub mtr_process_exit_status { ...@@ -347,49 +351,71 @@ sub mtr_process_exit_status {
# #
############################################################################## ##############################################################################
# We just "ping" on the ports, and if we can't do a socket connect
# we assume the server is dead. So we don't *really* know a server
# is dead, we just hope that it after letting the listen port go,
# it is dead enough for us to start a new server.
# Kill all processes(mysqld, ndbd, ndb_mgmd and im) that would conflict with
# this run
# Make sure to remove the PID file, if any.
# kill IM manager first, else it will restart the servers
sub mtr_kill_leftovers () { sub mtr_kill_leftovers () {
# First, kill all masters and slaves that would conflict with my @kill_pids;
# this run. Make sure to remove the PID file, if any. my %admin_pids;
# FIXME kill IM manager first, else it will restart the servers, how?! my $pid;
my @args;
for ( my $idx; $idx < 2; $idx++ ) #Start shutdown of instance_managers, masters and slaves
foreach my $srv (@{$::instance_manager->{'instances'}},@{$::master},@{$::slave})
{ {
push(@args,{ $pid= mtr_mysqladmin_start($srv, "shutdown", 70);
pid => 0, # We don't know the PID
pidfile => $::instance_manager->{'instances'}->[$idx]->{'path_pid'}, # Save the pid of the mysqladmin process
sockfile => $::instance_manager->{'instances'}->[$idx]->{'path_sock'}, $admin_pids{$pid}= 1;
port => $::instance_manager->{'instances'}->[$idx]->{'port'},
push(@kill_pids,{
pid => $srv->{'pid'},
pidfile => $srv->{'path_pid'},
sockfile => $srv->{'path_sock'},
port => $srv->{'port'},
}); });
$srv->{'pid'}= 0; # Assume we are done with it
} }
for ( my $idx; $idx < 2; $idx++ ) # Start shutdown of clusters
foreach my $cluster (@{$::clusters})
{ {
push(@args,{ $pid= mtr_ndbmgm_start($cluster, "shutdown");
pid => 0, # We don't know the PID
pidfile => $::master->[$idx]->{'path_mypid'}, # Save the pid of the ndb_mgm process
sockfile => $::master->[$idx]->{'path_mysock'}, $admin_pids{$pid}= 1;
port => $::master->[$idx]->{'path_myport'},
push(@kill_pids,{
pid => $cluster->{'pid'},
pidfile => $cluster->{'path_pid'},
port => $cluster->{'port'},
}); });
}
for ( my $idx; $idx < 3; $idx++ ) $cluster->{'pid'}= 0; # Assume we are done with it
foreach my $ndbd (@{$cluster->{'ndbds'}})
{ {
push(@args,{ push(@kill_pids,{
pid => 0, # We don't know the PID pid => $ndbd->{'pid'},
pidfile => $::slave->[$idx]->{'path_mypid'}, pidfile => $ndbd->{'path_pid'},
sockfile => $::slave->[$idx]->{'path_mysock'},
port => $::slave->[$idx]->{'path_myport'},
}); });
$ndbd->{'pid'}= 0; # Assume we are done with it
} }
mtr_mysqladmin_shutdown(\@args, 20); }
# Wait for all the admin processes to complete
mtr_wait_blocking(\%admin_pids);
# If we trusted "mysqladmin --shutdown_timeout= ..." we could just
# terminate now, but we don't (FIXME should be debugged).
# So we try again to ping and at least wait the same amount of time
# mysqladmin would for all to die.
mtr_ping_with_timeout(\@kill_pids);
# We now have tried to terminate nice. We have waited for the listen # We now have tried to terminate nice. We have waited for the listen
# port to be free, but can't really tell if the mysqld process died # port to be free, but can't really tell if the mysqld process died
...@@ -454,7 +480,7 @@ sub mtr_kill_leftovers () { ...@@ -454,7 +480,7 @@ sub mtr_kill_leftovers () {
do do
{ {
kill(9, @pids); kill(9, @pids);
mtr_debug("Sleep 1 second waiting for processes to die"); mtr_report("Sleep 1 second waiting for processes to die");
sleep(1) # Wait one second sleep(1) # Wait one second
} while ( $retries-- and kill(0, @pids) ); } while ( $retries-- and kill(0, @pids) );
...@@ -466,54 +492,62 @@ sub mtr_kill_leftovers () { ...@@ -466,54 +492,62 @@ sub mtr_kill_leftovers () {
} }
} }
# We may have failed everything, bug we now check again if we have # We may have failed everything, but we now check again if we have
# the listen ports free to use, and if they are free, just go for it. # the listen ports free to use, and if they are free, just go for it.
foreach my $srv ( @args ) foreach my $srv ( @kill_pids )
{ {
if ( mtr_ping_mysqld_server($srv->{'port'}, $srv->{'sockfile'}) ) if ( mtr_ping_port($srv->{'port'}) )
{ {
mtr_warning("can't kill old mysqld holding port $srv->{'port'}"); mtr_warning("can't kill old process holding port $srv->{'port'}");
} }
} }
} }
##############################################################################
#
# Shut down mysqld servers we have started from this run of this script
#
##############################################################################
# To speed things we kill servers in parallel. The argument is a list
# of 'ports', 'pids', 'pidfiles' and 'socketfiles'.
# Check that all processes in list is killed
# The argument is a list of 'ports', 'pids', 'pidfiles' and 'socketfiles'
# for which shutdown has been started. Make sure they all get killes
# in one way or the other.
#
# FIXME On Cygwin, and maybe some other platforms, $srv->{'pid'} and # FIXME On Cygwin, and maybe some other platforms, $srv->{'pid'} and
# $srv->{'pidfile'} will not be the same PID. We need to try to kill # the pid in $srv->{'pidfile'} will not be the same PID. We need to try to kill
# both I think. # both I think.
sub mtr_stop_mysqld_servers ($) { sub mtr_check_stop_servers ($) {
my $spec= shift; my $spec= shift;
# ---------------------------------------------------------------------- # Return if no processes are defined
# First try nice normal shutdown using 'mysqladmin' return if ! @$spec;
# ----------------------------------------------------------------------
# Shutdown time must be high as slave may be in reconnect #mtr_report("mtr_check_stop_servers");
mtr_mysqladmin_shutdown($spec, 70);
mtr_ping_with_timeout(\@$spec);
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# We loop with waitpid() nonblocking to see how many of the ones we # We loop with waitpid() nonblocking to see how many of the ones we
# are to kill, actually got killed by mtr_mysqladmin_shutdown(). # are to kill, actually got killed by mysqladmin or ndb_mgm
# Note that we don't rely on this, the mysqld server might have stop #
# Note that we don't rely on this, the mysqld server might have stopped
# listening to the port, but still be alive. But it is a start. # listening to the port, but still be alive. But it is a start.
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
foreach my $srv ( @$spec ) foreach my $srv ( @$spec )
{ {
if ( $srv->{'pid'} and (waitpid($srv->{'pid'},&WNOHANG) == $srv->{'pid'}) ) my $ret_pid;
if ( $srv->{'pid'} )
{
$ret_pid= waitpid($srv->{'pid'},&WNOHANG);
if ($ret_pid == $srv->{'pid'})
{ {
mtr_verbose("Catched exit of process $ret_pid");
$srv->{'pid'}= 0; $srv->{'pid'}= 0;
} }
else
{
# mtr_warning("catched exit of unknown child $ret_pid");
}
}
} }
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -546,13 +580,12 @@ sub mtr_stop_mysqld_servers ($) { ...@@ -546,13 +580,12 @@ sub mtr_stop_mysqld_servers ($) {
} }
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# If the processes where started from this script, and we had no PIDS # If all the processes in list already have been killed,
# then we don't have to do anything. # then we don't have to do anything.
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
if ( ! keys %mysqld_pids ) if ( ! keys %mysqld_pids )
{ {
# cluck "This is how we got here!";
return; return;
} }
...@@ -622,86 +655,96 @@ sub mtr_stop_mysqld_servers ($) { ...@@ -622,86 +655,96 @@ sub mtr_stop_mysqld_servers ($) {
} }
# Wait for all the process in the list to terminate
sub mtr_wait_blocking($) {
my $admin_pids= shift;
##############################################################################
#
# Shut down mysqld servers using "mysqladmin ... shutdown".
# To speed this up, we start them in parallel and use waitpid() to
# catch their termination. Note that this doesn't say the servers
# are terminated, just that 'mysqladmin' is terminated.
#
# Note that mysqladmin will ask the server about what PID file it uses,
# and mysqladmin will wait for it to be removed before it terminates
# (unless passes timeout).
#
# This function will take at most about 20 seconds, and we still are not
# sure we killed them all. If none is responding to ping, we return 1,
# else we return 0.
#
##############################################################################
sub mtr_mysqladmin_shutdown { # Return if no processes defined
my $spec= shift; return if ! %$admin_pids;
my $adm_shutdown_tmo= shift;
my %mysql_admin_pids; mtr_verbose("mtr_wait_blocking");
# Start one "mysqladmin shutdown" for each server # Wait for all the started processes to exit
foreach my $srv ( @$spec ) # As mysqladmin is such a simple program, we trust it to terminate itself.
# I.e. we wait blocking, and wait wait for them all before we go on.
foreach my $pid (keys %{$admin_pids})
{ {
my $args; my $ret_pid= waitpid($pid,0);
}
}
# Start "mysqladmin shutdown" for a specific mysqld
sub mtr_mysqladmin_start($$$) {
my $srv= shift;
my $command= shift;
my $adm_shutdown_tmo= shift;
my $args;
mtr_init_args(\$args); mtr_init_args(\$args);
mtr_add_arg($args, "--no-defaults"); mtr_add_arg($args, "--no-defaults");
mtr_add_arg($args, "--user=%s", $::opt_user); mtr_add_arg($args, "--user=%s", $::opt_user);
mtr_add_arg($args, "--password="); mtr_add_arg($args, "--password=");
mtr_add_arg($args, "--silent"); mtr_add_arg($args, "--silent");
if ( -e $srv->{'sockfile'} ) if ( -e $srv->{'path_sock'} )
{ {
mtr_add_arg($args, "--socket=%s", $srv->{'sockfile'}); mtr_add_arg($args, "--socket=%s", $srv->{'path_sock'});
} }
if ( $srv->{'port'} ) if ( $srv->{'port'} )
{ {
mtr_add_arg($args, "--port=%s", $srv->{'port'}); mtr_add_arg($args, "--port=%s", $srv->{'port'});
} }
if ( $srv->{'port'} and ! -e $srv->{'sockfile'} ) if ( $srv->{'port'} and ! -e $srv->{'path_sock'} )
{ {
mtr_add_arg($args, "--protocol=tcp"); # Needed if no --socket mtr_add_arg($args, "--protocol=tcp"); # Needed if no --socket
} }
mtr_add_arg($args, "--connect_timeout=5"); mtr_add_arg($args, "--connect_timeout=5");
# Shutdown time must be high as slave may be in reconnect # Shutdown time must be high as slave may be in reconnect
mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo"); mtr_add_arg($args, "--shutdown_timeout=$adm_shutdown_tmo");
mtr_add_arg($args, "shutdown"); mtr_add_arg($args, "$command");
my $path_mysqladmin_log= "$::opt_vardir/log/mysqladmin.log"; my $path_mysqladmin_log= "$::opt_vardir/log/mysqladmin.log";
# Start mysqladmin in paralell and wait for termination later
my $pid= mtr_spawn($::exe_mysqladmin, $args, my $pid= mtr_spawn($::exe_mysqladmin, $args,
"", $path_mysqladmin_log, $path_mysqladmin_log, "", "", $path_mysqladmin_log, $path_mysqladmin_log, "",
{ append_log_file => 1 }); { append_log_file => 1 });
# Save the pid of the mysqladmin process mtr_verbose("mtr_mysqladmin_start, pid: $pid");
$mysql_admin_pids{$pid}= 1; return $pid;
# We don't wait for termination of mysqladmin }
}
# Wait for all the started mysqladmin to exit # Start "ndb_mgm shutdown" for a specific cluster, it will
# As mysqladmin is such a simple program, we trust it to terminate. # shutdown all data nodes and leave the ndb_mgmd running
# I.e. we wait blocking, and wait wait for them all before we go on. sub mtr_ndbmgm_start($$) {
foreach my $pid (keys %mysql_admin_pids) my $cluster= shift;
{ my $command= shift;
my $ret_pid= waitpid($pid,0);
# If this was any of the mysqladmin's we waited for, delete its my $args;
# pid from list
delete $mysql_admin_pids{$ret_pid} if exists $mysql_admin_pids{$ret_pid}; mtr_init_args(\$args);
}
mtr_add_arg($args, "--no-defaults");
mtr_add_arg($args, "--core");
mtr_add_arg($args, "--try-reconnect=1");
mtr_add_arg($args, "--ndb_connectstring=%s", $cluster->{'connect_string'});
mtr_add_arg($args, "-e");
mtr_add_arg($args, "$command");
my $pid= mtr_spawn($::exe_ndb_mgm, $args,
"", "/dev/null", "/dev/null", "",
{});
mtr_verbose("mtr_ndbmgm_start, pid: $pid");
return $pid;
}
# If we trusted "mysqladmin --shutdown_timeout= ..." we could just
# terminate now, but we don't (FIXME should be debugged).
# So we try again to ping and at least wait the same amount of time
# mysqladmin would for all to die.
my $timeout= 20; # 20 seconds max # Ping all servers in list, exit when none of them answers
# or when timeout has passed
sub mtr_ping_with_timeout($) {
my $spec= shift;
my $timeout= 200; # 20 seconds max
my $res= 1; # If we just fall through, we are done my $res= 1; # If we just fall through, we are done
# in the sense that the servers don't # in the sense that the servers don't
# listen to their ports any longer # listen to their ports any longer
...@@ -711,10 +754,13 @@ sub mtr_mysqladmin_shutdown { ...@@ -711,10 +754,13 @@ sub mtr_mysqladmin_shutdown {
foreach my $srv ( @$spec ) foreach my $srv ( @$spec )
{ {
$res= 1; # We are optimistic $res= 1; # We are optimistic
if ( mtr_ping_mysqld_server($srv->{'port'}, $srv->{'sockfile'}) ) if ( $srv->{'pid'} and mtr_ping_port($srv->{'port'}) )
{ {
mtr_debug("Sleep 1 second waiting for processes to stop using port"); mtr_verbose("waiting for process $srv->{'pid'} to stop ".
sleep(1); # One second "using port $srv->{'port'}");
# Millisceond sleep emulated with select
select(undef, undef, undef, (0.1));
$res= 0; $res= 0;
next TIME; next TIME;
} }
...@@ -722,7 +768,7 @@ sub mtr_mysqladmin_shutdown { ...@@ -722,7 +768,7 @@ sub mtr_mysqladmin_shutdown {
last; # If we got here, we are done last; # If we got here, we are done
} }
$timeout or mtr_debug("At least one server is still listening to its port"); $timeout or mtr_report("At least one server is still listening to its port");
return $res; return $res;
} }
...@@ -743,12 +789,12 @@ sub mtr_record_dead_children () { ...@@ -743,12 +789,12 @@ sub mtr_record_dead_children () {
# -1 or 0 means there are no more procesess to wait for # -1 or 0 means there are no more procesess to wait for
while ( ($ret_pid= waitpid(-1,&WNOHANG)) != 0 and $ret_pid != -1) while ( ($ret_pid= waitpid(-1,&WNOHANG)) != 0 and $ret_pid != -1)
{ {
mtr_debug("waitpid() catched exit of child $ret_pid"); mtr_warning("waitpid() catched exit of child $ret_pid");
foreach my $idx (0..1) foreach my $idx (0..1)
{ {
if ( $::master->[$idx]->{'pid'} eq $ret_pid ) if ( $::master->[$idx]->{'pid'} eq $ret_pid )
{ {
mtr_debug("child $ret_pid was master[$idx]"); mtr_warning("child $ret_pid was master[$idx]");
$::master->[$idx]->{'pid'}= 0; $::master->[$idx]->{'pid'}= 0;
} }
} }
...@@ -757,11 +803,31 @@ sub mtr_record_dead_children () { ...@@ -757,11 +803,31 @@ sub mtr_record_dead_children () {
{ {
if ( $::slave->[$idx]->{'pid'} eq $ret_pid ) if ( $::slave->[$idx]->{'pid'} eq $ret_pid )
{ {
mtr_debug("child $ret_pid was slave[$idx]"); mtr_warning("child $ret_pid was slave[$idx]");
$::slave->[$idx]->{'pid'}= 0; $::slave->[$idx]->{'pid'}= 0;
last; last;
} }
} }
foreach my $cluster (@{$::clusters})
{
if ( $cluster->{'pid'} eq $ret_pid )
{
mtr_warning("child $ret_pid was $cluster->{'name'} cluster ndb_mgmd");
$cluster->{'pid'}= 0;
last;
}
foreach my $ndbd (@{$cluster->{'ndbds'}})
{
if ( $ndbd->{'pid'} eq $ret_pid )
{
mtr_warning("child $ret_pid was $cluster->{'name'} cluster ndbd");
$ndbd->{'pid'}= 0;
last;
}
}
}
} }
} }
...@@ -785,7 +851,8 @@ sub stop_reap_all { ...@@ -785,7 +851,8 @@ sub stop_reap_all {
$SIG{CHLD}= 'DEFAULT'; $SIG{CHLD}= 'DEFAULT';
} }
sub mtr_ping_mysqld_server () {
sub mtr_ping_port ($) {
my $port= shift; my $port= shift;
my $remote= "localhost"; my $remote= "localhost";
...@@ -839,12 +906,11 @@ sub sleep_until_file_created ($$$) { ...@@ -839,12 +906,11 @@ sub sleep_until_file_created ($$$) {
return 0; return 0;
} }
mtr_debug("Sleep $sleeptime milliseconds waiting for ". mtr_debug("Sleep $sleeptime milliseconds waiting for $pidfile");
"creation of $pidfile");
# Print extra message every 60 seconds # Print extra message every 60 seconds
my $seconds= ($loop * $sleeptime) / 1000; my $seconds= ($loop * $sleeptime) / 1000;
if ( $seconds > 1 and $seconds % 60 == 0 ) if ( $seconds > 1 and int($seconds) % 60 == 0 )
{ {
my $left= $timeout - $seconds; my $left= $timeout - $seconds;
mtr_warning("Waited $seconds seconds for $pidfile to be created, " . mtr_warning("Waited $seconds seconds for $pidfile to be created, " .
...@@ -861,7 +927,7 @@ sub sleep_until_file_created ($$$) { ...@@ -861,7 +927,7 @@ sub sleep_until_file_created ($$$) {
sub mtr_kill_processes ($) { sub mtr_kill_processes ($) {
my $pids = shift; my $pids = shift;
mtr_verbose("mtr_kill_processes " . join(" ", @$pids));
foreach my $sig (15, 9) foreach my $sig (15, 9)
{ {
my $retries= 10; my $retries= 10;
...@@ -869,9 +935,6 @@ sub mtr_kill_processes ($) { ...@@ -869,9 +935,6 @@ sub mtr_kill_processes ($) {
{ {
kill($sig, @{$pids}); kill($sig, @{$pids});
last unless kill (0, @{$pids}) and $retries--; last unless kill (0, @{$pids}) and $retries--;
mtr_debug("Sleep 2 second waiting for processes to die");
sleep(2);
} }
} }
} }
...@@ -904,7 +967,7 @@ sub mtr_kill_process ($$$$) { ...@@ -904,7 +967,7 @@ sub mtr_kill_process ($$$$) {
# FIXME something is wrong, we sometimes terminate with "Hangup" written # FIXME something is wrong, we sometimes terminate with "Hangup" written
# to tty, and no STDERR output telling us why. # to tty, and no STDERR output telling us why.
# FIXME for some readon, setting HUP to 'IGNORE' will cause exit() to # FIXME for some reason, setting HUP to 'IGNORE' will cause exit() to
# write out "Hangup", and maybe loose some output. We insert a sleep... # write out "Hangup", and maybe loose some output. We insert a sleep...
sub mtr_exit ($) { sub mtr_exit ($) {
......
mysql-test/lib/mtr_report.pl
View file @ 4f0bda6a
...@@ -21,6 +21,7 @@ sub mtr_warning (@); ...@@ -21,6 +21,7 @@ sub mtr_warning (@);
sub mtr_error (@); sub mtr_error (@);
sub mtr_child_error (@); sub mtr_child_error (@);
sub mtr_debug (@); sub mtr_debug (@);
sub mtr_verbose (@);
############################################################################## ##############################################################################
...@@ -122,7 +123,7 @@ sub mtr_report_test_failed ($) { ...@@ -122,7 +123,7 @@ sub mtr_report_test_failed ($) {
{ {
print "[ fail ] timeout\n"; print "[ fail ] timeout\n";
} }
elsif ( $tinfo->{'ndb_test'} and !$::flag_ndb_status_ok) elsif ( $tinfo->{'ndb_test'} and $::cluster->[0]->{'installed_ok'} eq "NO")
{ {
print "[ fail ] ndbcluster start failure\n"; print "[ fail ] ndbcluster start failure\n";
return; return;
...@@ -157,6 +158,7 @@ sub mtr_report_stats ($) { ...@@ -157,6 +158,7 @@ sub mtr_report_stats ($) {
my $tot_passed= 0; my $tot_passed= 0;
my $tot_failed= 0; my $tot_failed= 0;
my $tot_tests= 0; my $tot_tests= 0;
my $tot_restarts= 0;
my $found_problems= 0; # Some warnings are errors... my $found_problems= 0; # Some warnings are errors...
foreach my $tinfo (@$tests) foreach my $tinfo (@$tests)
...@@ -175,6 +177,10 @@ sub mtr_report_stats ($) { ...@@ -175,6 +177,10 @@ sub mtr_report_stats ($) {
$tot_tests++; $tot_tests++;
$tot_failed++; $tot_failed++;
} }
if ( $tinfo->{'restarted'} )
{
$tot_restarts++;
}
} }
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -197,6 +203,8 @@ sub mtr_report_stats ($) { ...@@ -197,6 +203,8 @@ sub mtr_report_stats ($) {
"the documentation at\n", "the documentation at\n",
"http://www.mysql.com/doc/en/MySQL_test_suite.html\n"; "http://www.mysql.com/doc/en/MySQL_test_suite.html\n";
} }
print
"The servers was restarted $tot_restarts times\n";
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# If a debug run, there might be interesting information inside # If a debug run, there might be interesting information inside
...@@ -335,5 +343,11 @@ sub mtr_debug (@) { ...@@ -335,5 +343,11 @@ sub mtr_debug (@) {
print STDERR "####: ",join(" ", @_),"\n"; print STDERR "####: ",join(" ", @_),"\n";
} }
} }
sub mtr_verbose (@) {
if ( $::opt_verbose )
{
print STDERR "> ",join(" ", @_),"\n";
}
}
1; 1;
mysql-test/lib/mtr_stress.pl
View file @ 4f0bda6a
...@@ -27,8 +27,7 @@ sub run_stress_test () ...@@ -27,8 +27,7 @@ sub run_stress_test ()
if ( ! $::glob_use_embedded_server and ! $::opt_local_master ) if ( ! $::glob_use_embedded_server and ! $::opt_local_master )
{ {
$::master->[0]->{'pid'}= mysqld_start('master',0,[],[],0); if ( ! mysqld_start($::master->[0],[],[]) )
if ( ! $::master->[0]->{'pid'} )
{ {
mtr_error("Can't start the mysqld server"); mtr_error("Can't start the mysqld server");
} }
......
mysql-test/mysql-test-run.pl
View file @ 4f0bda6a
...@@ -145,9 +145,6 @@ our $glob_use_running_ndbcluster_slave= 0; ...@@ -145,9 +145,6 @@ our $glob_use_running_ndbcluster_slave= 0;
our $glob_use_embedded_server= 0; our $glob_use_embedded_server= 0;
our @glob_test_mode; our @glob_test_mode;
our $using_ndbcluster_master= 0;
our $using_ndbcluster_slave= 0;
our $glob_basedir; our $glob_basedir;
# The total result # The total result
...@@ -171,6 +168,7 @@ our $opt_suite; ...@@ -171,6 +168,7 @@ our $opt_suite;
our $opt_netware; our $opt_netware;
our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_script_debug= 0; # Script debugging, enable with --script-debug
our $opt_verbose= 1; # Verbose output, enable with --verbose
# Options FIXME not all.... # Options FIXME not all....
...@@ -187,6 +185,8 @@ our $exe_mysqlimport; # Called from test case ...@@ -187,6 +185,8 @@ our $exe_mysqlimport; # Called from test case
our $exe_mysqlshow; # Called from test case our $exe_mysqlshow; # Called from test case
our $exe_mysql_fix_system_tables; our $exe_mysql_fix_system_tables;
our $exe_mysqltest; our $exe_mysqltest;
our $exe_ndbd;
our $exe_ndb_mgmd;
our $exe_slave_mysqld; our $exe_slave_mysqld;
our $exe_im; our $exe_im;
our $exe_my_print_defaults; our $exe_my_print_defaults;
...@@ -238,10 +238,10 @@ our $opt_gprof_master; ...@@ -238,10 +238,10 @@ our $opt_gprof_master;
our $opt_gprof_slave; our $opt_gprof_slave;
our $opt_local; our $opt_local;
our $opt_local_master;
our $master; # Will be struct in C our $master; # Will be struct in C
our $slave; our $slave;
our $clusters;
our $instance_manager; our $instance_manager;
...@@ -323,12 +323,9 @@ our $opt_skip_master_binlog= 0; ...@@ -323,12 +323,9 @@ our $opt_skip_master_binlog= 0;
our $opt_skip_slave_binlog= 0; our $opt_skip_slave_binlog= 0;
our $exe_ndb_mgm; our $exe_ndb_mgm;
our $exe_ndb_waiter;
our $path_ndb_tools_dir; our $path_ndb_tools_dir;
our $path_ndb_data_dir;
our $path_ndb_slave_data_dir;
our $file_ndb_testrun_log; our $file_ndb_testrun_log;
our $flag_ndb_status_ok= 1;
our $flag_ndb_slave_status_ok= 1;
our @data_dir_lst; our @data_dir_lst;
...@@ -350,25 +347,24 @@ sub check_ssl_support (); ...@@ -350,25 +347,24 @@ sub check_ssl_support ();
sub check_running_as_root(); sub check_running_as_root();
sub check_ndbcluster_support (); sub check_ndbcluster_support ();
sub rm_ndbcluster_tables ($); sub rm_ndbcluster_tables ($);
sub ndbcluster_install (); sub ndbcluster_start_install ($);
sub ndbcluster_start ($); sub ndbcluster_start ($$);
sub ndbcluster_stop (); sub ndbcluster_wait_started ($);
sub ndbcluster_install_slave ();
sub ndbcluster_start_slave ($);
sub ndbcluster_stop_slave ();
sub run_benchmarks ($); sub run_benchmarks ($);
sub initialize_servers (); sub initialize_servers ();
sub mysql_install_db (); sub mysql_install_db ();
sub install_db ($$); sub install_db ($$);
sub run_testcase ($); sub run_testcase ($);
sub run_testcase_stop_servers ($);
sub run_testcase_start_servers ($);
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 mysqld_start ($$$$$); sub ndbd_start ($$$);
sub mysqld_arguments ($$$$$$); sub ndb_mgmd_start ($);
sub stop_masters_slaves (); sub mysqld_start ($$$);
sub stop_masters (); sub mysqld_arguments ($$$$$);
sub stop_slaves (); sub stop_all_servers ();
sub im_start ($$); sub im_start ($$);
sub im_stop ($); sub im_stop ($);
sub run_mysqltest ($); sub run_mysqltest ($);
...@@ -657,11 +653,11 @@ sub command_line_setup () { ...@@ -657,11 +653,11 @@ sub command_line_setup () {
'debug' => \$opt_debug, 'debug' => \$opt_debug,
'fast' => \$opt_fast, 'fast' => \$opt_fast,
'local' => \$opt_local, 'local' => \$opt_local,
'local-master' => \$opt_local_master,
'netware' => \$opt_netware, 'netware' => \$opt_netware,
'old-master' => \$opt_old_master, 'old-master' => \$opt_old_master,
'reorder' => \$opt_reorder, 'reorder' => \$opt_reorder,
'script-debug' => \$opt_script_debug, 'script-debug' => \$opt_script_debug,
'verbose' => \$opt_verbose,
'sleep=i' => \$opt_sleep, 'sleep=i' => \$opt_sleep,
'socket=s' => \$opt_socket, 'socket=s' => \$opt_socket,
'start-dirty' => \$opt_start_dirty, 'start-dirty' => \$opt_start_dirty,
...@@ -774,11 +770,31 @@ sub command_line_setup () { ...@@ -774,11 +770,31 @@ sub command_line_setup () {
push(@glob_test_mode, "ps-protocol"); push(@glob_test_mode, "ps-protocol");
} }
# FIXME don't understand what this is if ( $opt_ndbconnectstring )
# if ( $opt_local_master ) {
# { $glob_use_running_ndbcluster= 1;
# $opt_master_myport= 3306; }
# } else
{
$opt_ndbconnectstring= "host=localhost:$opt_ndbcluster_port";
}
if ( $opt_skip_ndbcluster_slave )
{
$opt_with_ndbcluster_slave= 0;
}
else
{
$opt_with_ndbcluster_slave= 1;
if ( $opt_ndbconnectstring_slave )
{
$glob_use_running_ndbcluster_slave= 1;
}
else
{
$opt_ndbconnectstring_slave= "host=localhost:$opt_ndbcluster_port_slave";
}
}
if ( $opt_small_bench ) if ( $opt_small_bench )
{ {
...@@ -867,62 +883,74 @@ sub command_line_setup () { ...@@ -867,62 +883,74 @@ sub command_line_setup () {
$master->[0]= $master->[0]=
{ {
type => "master",
idx => 0,
path_myddir => "$opt_vardir/master-data", path_myddir => "$opt_vardir/master-data",
path_myerr => "$opt_vardir/log/master.err", path_myerr => "$opt_vardir/log/master.err",
path_mylog => "$opt_vardir/log/master.log", path_mylog => "$opt_vardir/log/master.log",
path_mypid => "$opt_vardir/run/master.pid", path_pid => "$opt_vardir/run/master.pid",
path_mysock => "$sockdir/master.sock", path_sock => "$sockdir/master.sock",
path_myport => $opt_master_myport, port => $opt_master_myport,
start_timeout => 400, # enough time create innodb tables start_timeout => 400, # enough time create innodb tables
cluster => 0, # index in clusters list
ndbcluster => 1, # ndbcluster not started
master_opt => [], master_opt => [],
}; };
$master->[1]= $master->[1]=
{ {
type => "master",
idx => 1,
path_myddir => "$opt_vardir/master1-data", path_myddir => "$opt_vardir/master1-data",
path_myerr => "$opt_vardir/log/master1.err", path_myerr => "$opt_vardir/log/master1.err",
path_mylog => "$opt_vardir/log/master1.log", path_mylog => "$opt_vardir/log/master1.log",
path_mypid => "$opt_vardir/run/master1.pid", path_pid => "$opt_vardir/run/master1.pid",
path_mysock => "$sockdir/master1.sock", path_sock => "$sockdir/master1.sock",
path_myport => $opt_master_myport + 1, port => $opt_master_myport + 1,
start_timeout => 400, # enough time create innodb tables start_timeout => 400, # enough time create innodb tables
cluster => 0, # index in clusters list
}; };
$slave->[0]= $slave->[0]=
{ {
type => "slave",
idx => 0,
path_myddir => "$opt_vardir/slave-data", path_myddir => "$opt_vardir/slave-data",
path_myerr => "$opt_vardir/log/slave.err", path_myerr => "$opt_vardir/log/slave.err",
path_mylog => "$opt_vardir/log/slave.log", path_mylog => "$opt_vardir/log/slave.log",
path_mypid => "$opt_vardir/run/slave.pid", path_pid => "$opt_vardir/run/slave.pid",
path_mysock => "$sockdir/slave.sock", path_sock => "$sockdir/slave.sock",
path_myport => $opt_slave_myport, port => $opt_slave_myport,
start_timeout => 400, start_timeout => 400,
ndbcluster => 1, # ndbcluster not started cluster => 1, # index in clusters list
}; };
$slave->[1]= $slave->[1]=
{ {
type => "slave",
idx => 1,
path_myddir => "$opt_vardir/slave1-data", path_myddir => "$opt_vardir/slave1-data",
path_myerr => "$opt_vardir/log/slave1.err", path_myerr => "$opt_vardir/log/slave1.err",
path_mylog => "$opt_vardir/log/slave1.log", path_mylog => "$opt_vardir/log/slave1.log",
path_mypid => "$opt_vardir/run/slave1.pid", path_pid => "$opt_vardir/run/slave1.pid",
path_mysock => "$sockdir/slave1.sock", path_sock => "$sockdir/slave1.sock",
path_myport => $opt_slave_myport + 1, port => $opt_slave_myport + 1,
start_timeout => 300, start_timeout => 300,
cluster => -1, # index in clusters list
}; };
$slave->[2]= $slave->[2]=
{ {
type => "slave",
idx => 2,
path_myddir => "$opt_vardir/slave2-data", path_myddir => "$opt_vardir/slave2-data",
path_myerr => "$opt_vardir/log/slave2.err", path_myerr => "$opt_vardir/log/slave2.err",
path_mylog => "$opt_vardir/log/slave2.log", path_mylog => "$opt_vardir/log/slave2.log",
path_mypid => "$opt_vardir/run/slave2.pid", path_pid => "$opt_vardir/run/slave2.pid",
path_mysock => "$sockdir/slave2.sock", path_sock => "$sockdir/slave2.sock",
path_myport => $opt_slave_myport + 2, port => $opt_slave_myport + 2,
start_timeout => 300, start_timeout => 300,
cluster => -1, # index in clusters list
}; };
$instance_manager= $instance_manager=
...@@ -962,11 +990,48 @@ sub command_line_setup () { ...@@ -962,11 +990,48 @@ sub command_line_setup () {
old_log_format => 1 old_log_format => 1
}; };
my $data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port";
$clusters->[0]=
{
name => "Master",
nodes => 2,
port => "$opt_ndbcluster_port",
data_dir => "$data_dir",
connect_string => "$opt_ndbconnectstring",
path_pid => "$data_dir/ndb_3.pid", # Nodes + 1
pid => 0, # pid of ndb_mgmd
};
$data_dir= "$opt_vardir/ndbcluster-$opt_ndbcluster_port_slave";
$clusters->[1]=
{
name => "Slave",
nodes => 1,
port => "$opt_ndbcluster_port_slave",
data_dir => "$data_dir",
connect_string => "$opt_ndbconnectstring_slave",
path_pid => "$data_dir/ndb_2.pid", # Nodes + 1
pid => 0, # pid of ndb_mgmd
};
# Init pids of ndbd's
foreach my $cluster ( @{$clusters} )
{
for ( my $idx= 0; $idx < $cluster->{'nodes'}; $idx++ )
{
$cluster->{'ndbds'}->[$idx]=
{
pid => 0,
path_pid => "$cluster->{'data_dir'}/ndb_{$idx+1}.pid",
};
}
}
if ( $opt_extern ) if ( $opt_extern )
{ {
$glob_use_running_server= 1; $glob_use_running_server= 1;
$opt_skip_rpl= 1; # We don't run rpl test cases $opt_skip_rpl= 1; # We don't run rpl test cases
$master->[0]->{'path_mysock'}= $opt_socket; $master->[0]->{'path_sock'}= $opt_socket;
} }
$path_timefile= "$opt_vardir/log/mysqltest-time"; $path_timefile= "$opt_vardir/log/mysqltest-time";
...@@ -1093,6 +1158,9 @@ sub executable_setup () { ...@@ -1093,6 +1158,9 @@ sub executable_setup () {
"/usr/bin/false"); "/usr/bin/false");
$path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools"); $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");
$exe_ndb_mgm= "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm"; $exe_ndb_mgm= "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";
$exe_ndb_waiter= "$glob_basedir/storage/ndb/tools/ndb_waiter";
$exe_ndbd= "$glob_basedir/storage/ndb/src/kernel/ndbd";
$exe_ndb_mgmd= "$glob_basedir/storage/ndb/src/mgmsrv/ndb_mgmd";
$lib_udf_example= $lib_udf_example=
mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so"); mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so");
} }
...@@ -1152,13 +1220,14 @@ sub executable_setup () { ...@@ -1152,13 +1220,14 @@ sub executable_setup () {
$path_ndb_tools_dir= "$glob_basedir/bin"; $path_ndb_tools_dir= "$glob_basedir/bin";
$exe_ndb_mgm= "$glob_basedir/bin/ndb_mgm"; $exe_ndb_mgm= "$glob_basedir/bin/ndb_mgm";
$exe_ndb_waiter= "$glob_basedir/bin/ndb_waiter";
$exe_ndbd= "$glob_basedir/libexec/ndbd";
$exe_ndb_mgmd= "$glob_basedir/libexec/ndb_mgmd";
} }
$exe_master_mysqld= $exe_master_mysqld || $exe_mysqld; $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld;
$exe_slave_mysqld= $exe_slave_mysqld || $exe_mysqld; $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"; $file_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log";
} }
...@@ -1207,13 +1276,13 @@ sub environment_setup () { ...@@ -1207,13 +1276,13 @@ sub environment_setup () {
$ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir; $ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir;
$ENV{'MYSQLTEST_VARDIR'}= $opt_vardir; $ENV{'MYSQLTEST_VARDIR'}= $opt_vardir;
$ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir; $ENV{'MYSQL_TMP_DIR'}= $opt_tmpdir;
$ENV{'MASTER_MYSOCK'}= $master->[0]->{'path_mysock'}; $ENV{'MASTER_MYSOCK'}= $master->[0]->{'path_sock'};
$ENV{'MASTER_MYSOCK1'}= $master->[1]->{'path_mysock'}; $ENV{'MASTER_MYSOCK1'}= $master->[1]->{'path_sock'};
$ENV{'MASTER_MYPORT'}= $master->[0]->{'path_myport'}; $ENV{'MASTER_MYPORT'}= $master->[0]->{'port'};
$ENV{'MASTER_MYPORT1'}= $master->[1]->{'path_myport'}; $ENV{'MASTER_MYPORT1'}= $master->[1]->{'port'};
$ENV{'SLAVE_MYPORT'}= $slave->[0]->{'path_myport'}; $ENV{'SLAVE_MYPORT'}= $slave->[0]->{'port'};
$ENV{'SLAVE_MYPORT1'}= $slave->[1]->{'path_myport'}; $ENV{'SLAVE_MYPORT1'}= $slave->[1]->{'port'};
$ENV{'SLAVE_MYPORT2'}= $slave->[2]->{'path_myport'}; $ENV{'SLAVE_MYPORT2'}= $slave->[2]->{'port'};
# $ENV{'MYSQL_TCP_PORT'}= '@MYSQL_TCP_PORT@'; # FIXME # $ENV{'MYSQL_TCP_PORT'}= '@MYSQL_TCP_PORT@'; # FIXME
$ENV{'MYSQL_TCP_PORT'}= 3306; $ENV{'MYSQL_TCP_PORT'}= 3306;
...@@ -1267,7 +1336,7 @@ sub signal_setup () { ...@@ -1267,7 +1336,7 @@ sub signal_setup () {
sub handle_int_signal () { sub handle_int_signal () {
$SIG{INT}= 'DEFAULT'; # If we get a ^C again, we die... $SIG{INT}= 'DEFAULT'; # If we get a ^C again, we die...
mtr_warning("got INT signal, cleaning up....."); mtr_warning("got INT signal, cleaning up.....");
stop_masters_slaves(); stop_all_servers();
mtr_error("We die from ^C signal from user"); mtr_error("We die from ^C signal from user");
} }
...@@ -1283,11 +1352,11 @@ sub kill_running_server () { ...@@ -1283,11 +1352,11 @@ sub kill_running_server () {
if ( $opt_fast or $glob_use_embedded_server ) if ( $opt_fast or $glob_use_embedded_server )
{ {
# FIXME is embedded server really using PID files?! # FIXME is embedded server really using PID files?!
unlink($master->[0]->{'path_mypid'}); unlink($master->[0]->{'path_pid'});
unlink($master->[1]->{'path_mypid'}); unlink($master->[1]->{'path_pid'});
unlink($slave->[0]->{'path_mypid'}); unlink($slave->[0]->{'path_pid'});
unlink($slave->[1]->{'path_mypid'}); unlink($slave->[1]->{'path_pid'});
unlink($slave->[2]->{'path_mypid'}); unlink($slave->[2]->{'path_pid'});
} }
else else
{ {
...@@ -1300,12 +1369,6 @@ sub kill_running_server () { ...@@ -1300,12 +1369,6 @@ sub kill_running_server () {
mkpath("$opt_vardir/log"); # Needed for mysqladmin log mkpath("$opt_vardir/log"); # Needed for mysqladmin log
mtr_kill_leftovers(); mtr_kill_leftovers();
$using_ndbcluster_master= $opt_with_ndbcluster;
ndbcluster_stop();
$master->[0]->{'ndbcluster'}= 1;
$using_ndbcluster_slave= $opt_with_ndbcluster;
ndbcluster_stop_slave();
$slave->[0]->{'ndbcluster'}= 1;
} }
} }
...@@ -1477,216 +1540,217 @@ sub check_ndbcluster_support () { ...@@ -1477,216 +1540,217 @@ sub check_ndbcluster_support () {
return; return;
} }
mtr_report("Using ndbcluster if necessary, mysqld supports it"); mtr_report("Using ndbcluster when necessary, mysqld supports it");
$opt_with_ndbcluster= 1; $opt_with_ndbcluster= 1;
if ( $opt_ndbconnectstring )
{
$glob_use_running_ndbcluster= 1;
}
else
{
$opt_ndbconnectstring= "host=localhost:$opt_ndbcluster_port";
}
if ( $opt_skip_ndbcluster_slave )
{
$opt_with_ndbcluster_slave= 0;
}
else
{
$opt_with_ndbcluster_slave= 1;
if ( $opt_ndbconnectstring_slave )
{
$glob_use_running_ndbcluster_slave= 1;
}
else
{
$opt_ndbconnectstring_slave= "host=localhost:$opt_ndbcluster_port_slave";
}
}
return; return;
} }
sub ndbcluster_install () { sub ndbcluster_start_install ($) {
my $cluster= shift;
if ( ! $opt_with_ndbcluster or $glob_use_running_ndbcluster ) if ( ! $opt_with_ndbcluster or $glob_use_running_ndbcluster )
{ {
return 0; return 0;
} }
mtr_report("Installing ndbcluster master");
my $ndbcluster_opts= $opt_bench ? "" : "--small";
if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
["--port=$opt_ndbcluster_port",
"--data-dir=$opt_vardir",
"--verbose=2",
$ndbcluster_opts,
"--initial",
"--relative-config-data-dir",
"--core"],
"", "", "", "") )
{
return 1;
}
$using_ndbcluster_master= 1;
ndbcluster_stop();
$master->[0]->{'ndbcluster'}= 1;
return 0; mtr_report("Installing $cluster->{'name'} Cluster");
}
mkdir($cluster->{'data_dir'});
sub ndbcluster_start ($) { # Create a config file from template
my $use_ndbcluster= shift; my $ndb_no_ord=512;
my $ndb_no_attr=2048;
my $ndb_con_op=105000;
my $ndb_dmem="80M";
my $ndb_imem="24M";
my $ndb_pbmem="32M";
my $nodes= $cluster->{'nodes'};
my $ndb_host= "localhost";
my $ndb_diskless= 0;
if ( ! $use_ndbcluster ) if (!$opt_bench)
{
$using_ndbcluster_master= 0;
return 0;
}
if ( $glob_use_running_ndbcluster )
{ {
$using_ndbcluster_master= 1; # Use a smaller configuration
return 0; $ndb_no_ord=32;
$ndb_con_op=5000;
$ndb_dmem="20M";
$ndb_imem="1M";
$ndb_pbmem="4M";
} }
if ( $using_ndbcluster_master )
my $config_file_template= "ndb/ndb_config_${nodes}_node.ini";
my $config_file= "$cluster->{'data_dir'}/config.ini";
open(IN, $config_file_template)
or mtr_error("Can't open $config_file_template: $!");
open(OUT, ">", $config_file)
or mtr_error("Can't write to $config_file: $!");
while (<IN>)
{ {
# Master already started chomp;
return 0;
} s/CHOOSE_MaxNoOfAttributes/$ndb_no_attr/;
# FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null s/CHOOSE_MaxNoOfOrderedIndexes/$ndb_no_ord/;
#mtr_report("Starting ndbcluster master"); s/CHOOSE_MaxNoOfConcurrentOperations/$ndb_con_op/;
if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster", s/CHOOSE_DataMemory/$ndb_dmem/;
["--port=$opt_ndbcluster_port", s/CHOOSE_IndexMemory/$ndb_imem/;
"--data-dir=$opt_vardir", s/CHOOSE_Diskless/$ndb_diskless/;
"--character-sets-dir=$path_charsetsdir", s/CHOOSE_HOSTNAME_.*/$ndb_host/;
"--verbose=2", s/CHOOSE_FILESYSTEM/$cluster->{'data_dir'}/;
"--core"], s/CHOOSE_PORT_MGM/$cluster->{'port'}/;
"", "/dev/null", "", "") ) s/CHOOSE_DiskPageBufferMemory/$ndb_pbmem/;
{
mtr_error("Error ndbcluster_start"); # if ( /^\s*$/ )
$using_ndbcluster_master= 0; # {
return 1; # print OUT "\n";
# }
# elsif (/;$/)
# {
# print OUT "$_\n";
# }
# else
# {
print OUT "$_ \n";
# }
} }
close OUT;
close IN;
# Start cluster with "--initial"
ndbcluster_start($cluster, "--initial");
$using_ndbcluster_master= 1;
return 0; return 0;
} }
sub rm_ndbcluster_tables ($) {
my $dir= shift; sub ndbcluster_wait_started($){
foreach my $bin ( glob("$dir/cluster/apply_status*"), my $cluster= shift;
glob("$dir/cluster/schema*") ) my $path_waiter_log= "$opt_vardir/log/ndb_waiter.log";
{
unlink($bin); # Start the ndb_waiter which will connect to the ndb_mgmd
} # and poll it for state of the ndbd's, will return when
# all nodes in the cluster is started
my $res= mtr_run($exe_ndb_waiter,
["--no-defaults",
"--core",
"--ndb-connectstring=$cluster->{'connect_string'}",
"--timeout=60"],
"", $path_waiter_log, $path_waiter_log, "");
mtr_verbose("ndbcluster_wait_started, returns: $res") if $res;
return $res;
} }
sub ndbcluster_stop () {
if ( ! $using_ndbcluster_master or $glob_use_running_ndbcluster )
{ sub ndb_mgmd_start ($) {
$using_ndbcluster_master= 0; my $cluster= shift;
return;
} my $args; # Arg vector
# FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null my $pid= -1;
#mtr_report("Stopping ndbcluster master");
mtr_run("$glob_mysql_test_dir/ndb/ndbcluster", mtr_init_args(\$args);
["--port=$opt_ndbcluster_port", mtr_add_arg($args, "--no-defaults");
"--data-dir=$opt_vardir", mtr_add_arg($args, "--core");
"--verbose=2", mtr_add_arg($args, "--config-file=%s", "$cluster->{'data_dir'}/config.ini");
"--stop"],
"", "/dev/null", "", "");
my $path_ndb_mgmd_log= "$opt_vardir/log/\l$cluster->{'name'}_ndb_mgmd.log";
rm_ndbcluster_tables ($master->[0]->{'path_myddir'}); $pid= mtr_spawn($exe_ndb_mgmd, $args, "",
rm_ndbcluster_tables ($master->[1]->{'path_myddir'}); $path_ndb_mgmd_log,
$using_ndbcluster_master= 0; $path_ndb_mgmd_log,
return; "",
{ append_log_file => 1 });
# Remember pid of ndb_mgmd
$cluster->{'pid'}= $pid;
mtr_verbose("ndb_mgmd_start, pid: $pid");
return $pid;
} }
sub ndbcluster_install_slave () {
if ( ! $opt_with_ndbcluster_slave or $glob_use_running_ndbcluster_slave ) sub ndbd_start ($$$) {
{ my $cluster= shift;
return 0; my $idx= shift;
} my $extra_args= shift;
mtr_report("Installing ndbcluster slave");
if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
["--port=$opt_ndbcluster_port_slave",
"--data-dir=$opt_vardir",
"--verbose=2",
"--small",
"--ndbd-nodes=1",
"--initial",
"--relative-config-data-dir",
"--core"],
"", "", "", "") )
{
return 1;
}
$using_ndbcluster_slave= 1; my $args; # Arg vector
ndbcluster_stop_slave(); my $pid= -1;
$slave->[0]->{'ndbcluster'}= 1;
return 0; mtr_init_args(\$args);
mtr_add_arg($args, "--no-defaults");
mtr_add_arg($args, "--core");
mtr_add_arg($args, "--ndb-connectstring=%s", "$cluster->{'connect_string'}");
mtr_add_arg($args, "--character-sets-dir=%s", "$path_charsetsdir");
mtr_add_arg($args, "--nodaemon");
mtr_add_arg($args, "$extra_args");
my $path_ndbd_log= "$opt_vardir/log/\l$cluster->{'name'}_ndbd_$idx.log";
$pid= mtr_spawn($exe_ndbd, $args, "",
$path_ndbd_log,
$path_ndbd_log,
"",
{ append_log_file => 1 });
# Add pid to list of pids for this cluster
$cluster->{'ndbds'}->[$idx]->{'pid'}= $pid;
mtr_verbose("ndbd_start, pid: $pid");
return $pid;
} }
sub ndbcluster_start_slave ($) {
my $use_ndbcluster= shift;
if ( ! $use_ndbcluster ) sub ndbcluster_start ($$) {
my $cluster= shift;
my $extra_args= shift;
mtr_verbose("ndbcluster_start '$cluster->{'name'}'");
if ( $glob_use_running_ndbcluster )
{ {
$using_ndbcluster_slave= 0;
return 0; return 0;
} }
if ( $glob_use_running_ndbcluster_slave )
if ( $cluster->{'pid'} )
{ {
$using_ndbcluster_slave= 1; mtr_error("Cluster '$cluster->{'name'}' already started");
return 0;
} }
# FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null my $pid= ndb_mgmd_start($cluster);
#mtr_report("Starting ndbcluster slave");
if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster", # FIXME Should not be needed
["--port=$opt_ndbcluster_port_slave", # Unfortunately cluster will fail
"--data-dir=$opt_vardir", # if ndb_mgmd has not started properly
"--verbose=2", # Wait for the ndb_mgmd pid file to be created
"--ndbd-nodes=1", if (!sleep_until_file_created($cluster->{'path_pid'},
"--core"], 60,
"", "/dev/null", "", "") ) $pid))
{ {
mtr_error("Error ndbcluster_start_slave"); mtr_warning("Failed to start ndb_mgmd for $cluster->{'name'} cluster");
$using_ndbcluster_slave= 0;
return 1; return 1;
} }
$using_ndbcluster_slave= 1;
for ( my $idx= 0; $idx < $cluster->{'nodes'}; $idx++ )
{
ndbd_start($cluster, $idx, $extra_args);
}
return 0; return 0;
} }
sub ndbcluster_stop_slave () {
if ( ! $using_ndbcluster_slave or $glob_use_running_ndbcluster_slave ) sub rm_ndbcluster_tables ($) {
my $dir= shift;
foreach my $bin ( glob("$dir/cluster/apply_status*"),
glob("$dir/cluster/schema*") )
{ {
$using_ndbcluster_slave= 0; unlink($bin);
return;
} }
# FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null
#mtr_report("Stopping ndbcluster slave");
mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
["--port=$opt_ndbcluster_port_slave",
"--data-dir=$opt_vardir",
"--verbose=2",
"--stop"],
"", "/dev/null", "", "");
rm_ndbcluster_tables ($slave->[0]->{'path_myddir'});
$using_ndbcluster_slave= 0;
return;
} }
...@@ -1701,10 +1765,9 @@ sub run_benchmarks ($) { ...@@ -1701,10 +1765,9 @@ sub run_benchmarks ($) {
my $args; my $args;
if ( ! $glob_use_embedded_server and ! $opt_local_master ) if ( ! $glob_use_embedded_server )
{ {
$master->[0]->{'pid'}= mysqld_start('master',0,[],[], mysqld_start($master->[0],[],[]);
$using_ndbcluster_master);
if ( ! $master->[0]->{'pid'} ) if ( ! $master->[0]->{'pid'} )
{ {
mtr_error("Can't start the mysqld server"); mtr_error("Can't start the mysqld server");
...@@ -1713,7 +1776,7 @@ sub run_benchmarks ($) { ...@@ -1713,7 +1776,7 @@ sub run_benchmarks ($) {
mtr_init_args(\$args); mtr_init_args(\$args);
mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_mysock'}); mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_sock'});
mtr_add_arg($args, "--user=%s", $opt_user); mtr_add_arg($args, "--user=%s", $opt_user);
if ( $opt_small_bench ) if ( $opt_small_bench )
...@@ -1792,7 +1855,7 @@ sub run_suite () { ...@@ -1792,7 +1855,7 @@ sub run_suite () {
! $glob_use_running_server and ! $glob_use_running_server and
! $glob_use_embedded_server ) ! $glob_use_embedded_server )
{ {
stop_masters_slaves(); stop_all_servers();
} }
if ( $opt_gcov ) if ( $opt_gcov )
...@@ -1854,42 +1917,51 @@ sub mysql_install_db () { ...@@ -1854,42 +1917,51 @@ sub mysql_install_db () {
im_prepare_env($instance_manager); im_prepare_env($instance_manager);
} }
if ( ndbcluster_install() )
{ my $cluster_started_ok= 1; # Assume it can be started
if ( $opt_force)
if (ndbcluster_start_install($clusters->[0]) ||
$use_slaves && ndbcluster_start_install($clusters->[1]))
{ {
# failed to install, disable usage and flag that its no ok mtr_warning("Failed to start install of cluster");
mtr_report("ndbcluster_install failed, continuing without cluster"); $cluster_started_ok= 0;
$opt_with_ndbcluster= 0;
$flag_ndb_status_ok= 0;
$ENV{'NDB_STATUS_OK'}= "NO";
} }
else
foreach my $cluster (@{$clusters})
{ {
print "Aborting: Failed to install ndb cluster\n";
print "To continue, re-run with '--force'.\n"; next if !$cluster->{'pid'};
mtr_exit(1);
$cluster->{'installed_ok'}= "YES"; # Assume install suceeds
if (ndbcluster_wait_started($cluster))
{
# failed to install, disable usage and flag that its no ok
mtr_report("ndbcluster_install of $cluster->{'name'} failed, " .
"continuing without it");
$cluster->{"installed_ok"}= "NO";
$cluster_started_ok= 0;
} }
} }
if ( $use_slaves and ndbcluster_install_slave() ) if ( ! $cluster_started_ok )
{ {
if ( $opt_force) if ( $opt_force)
{ {
# failed to install, disable usage and flag that its no ok # Continue without cluster
mtr_report("ndbcluster_install_slave failed, " .
"continuing without slave cluster");
$opt_with_ndbcluster_slave= 0;
$flag_ndb_slave_status_ok= 0;
} }
else else
{ {
print "Aborting: Failed to install ndb cluster\n"; mtr_error("To continue, re-run with '--force'.");
print "To continue, re-run with '--force'.\n";
mtr_exit(1);
} }
} }
# Stop clusters...
stop_all_servers();
return 0; return 0;
} }
...@@ -2077,8 +2149,6 @@ sub run_testcase ($) { ...@@ -2077,8 +2149,6 @@ sub run_testcase ($) {
my $tname= $tinfo->{'name'}; my $tname= $tinfo->{'name'};
my $ndbcluster_opt;
mtr_tonewfile($path_current_test_log,"$tname\n"); # Always tell where we are mtr_tonewfile($path_current_test_log,"$tname\n"); # Always tell where we are
# output current test to ndbcluster log file to enable diagnostics # output current test to ndbcluster log file to enable diagnostics
...@@ -2098,75 +2168,15 @@ sub run_testcase ($) { ...@@ -2098,75 +2168,15 @@ sub run_testcase ($) {
return; return;
} }
if ( $tinfo->{'ndb_test'} and ! $flag_ndb_status_ok ) # FIXME if test need slave cluster, check if that is installed_ok
if ( $tinfo->{'ndb_test'} and $clusters->[0]->{'installed_ok'} eq "NO" )
{ {
mtr_report_test_name($tinfo); mtr_report_test_name($tinfo);
mtr_report_test_failed($tinfo); mtr_report_test_failed($tinfo);
return; return;
} }
# ---------------------------------------------------------------------- run_testcase_stop_servers($tinfo);
# If not using a running servers we may need to stop and restart.
# We restart in the case we have initiation scripts, server options
# etc to run. But we also restart again after the test first restart
# and test is run, to get back to normal server settings.
#
# To make the code a bit more clean, we actually only stop servers
# here, and mark this to be done. Then a generic "start" part will
# start up the needed servers again.
# ----------------------------------------------------------------------
if ( ! $glob_use_running_server and ! $glob_use_embedded_server )
{
# We try to find out if we are to restart the server
my $do_restart= 0; # Assumes we don't have to
if ( $tinfo->{'master_sh'} )
{
$do_restart= 1; # Always restart if script to run
}
elsif ( $opt_with_ndbcluster and $tinfo->{'ndb_test'} != $using_ndbcluster_master )
{
$do_restart= 1; # Restart without cluster
}
elsif ( $master->[0]->{'running_master_is_special'} and
$master->[0]->{'running_master_is_special'}->{'timezone'} eq
$tinfo->{'timezone'} and
mtr_same_opts($master->[0]->{'running_master_is_special'}->{'master_opt'},
$tinfo->{'master_opt'}) )
{
# If running master was started with special settings, but
# the current test requuires the same ones, we *don't* restart.
$do_restart= 0;
}
elsif ( $tinfo->{'master_restart'} or
$master->[0]->{'running_master_is_special'} )
{
$do_restart= 1;
}
# Check that running master was started with same options
# as the current test requires
elsif (! mtr_same_opts($master->[0]->{'master_opt'},
$tinfo->{'master_opt'}) )
{
$do_restart= 1;
}
if ( $do_restart )
{
stop_masters();
delete $master->[0]->{'running_master_is_special'}; # Forget history
}
# ----------------------------------------------------------------------
# Always terminate all slaves, if any. Else we may have useless
# reconnection attempts and error messages in case the slave and
# master servers restart.
# ----------------------------------------------------------------------
stop_slaves();
}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Prepare to start masters. Even if we use embedded, we want to run # Prepare to start masters. Even if we use embedded, we want to run
...@@ -2175,18 +2185,12 @@ sub run_testcase ($) { ...@@ -2175,18 +2185,12 @@ sub run_testcase ($) {
$ENV{'TZ'}= $tinfo->{'timezone'}; $ENV{'TZ'}= $tinfo->{'timezone'};
mtr_report_test_name($tinfo);
mtr_tofile($master->[0]->{'path_myerr'},"CURRENT_TEST: $tname\n"); mtr_tofile($master->[0]->{'path_myerr'},"CURRENT_TEST: $tname\n");
if ( $master->[1]->{'pid'} ) if ( $master->[1]->{'pid'} )
{ {
mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n"); mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");
} }
# FIXME test cases that depend on each other, prevent this from
# being at this location.
# do_before_start_master($tname,$tinfo->{'master_sh'});
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# If any mysqld servers running died, we have to know # If any mysqld servers running died, we have to know
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -2194,144 +2198,27 @@ sub run_testcase ($) { ...@@ -2194,144 +2198,27 @@ sub run_testcase ($) {
mtr_record_dead_children(); mtr_record_dead_children();
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Start masters # Start masters needed by the testcase
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
run_testcase_start_servers($tinfo);
if ( ! $glob_use_running_server and ! $glob_use_embedded_server ) # ----------------------------------------------------------------------
{ # If --start-and-exit or --start-dirty given, stop here to let user manually
# FIXME give the args to the embedded server?! # run tests
# FIXME what does $opt_local_master mean?! # ----------------------------------------------------------------------
# FIXME split up start and check that started so that can do
# starts in parallel, masters and slaves at the same time.
if ( $tinfo->{'component_id'} eq 'mysqld' and ! $opt_local_master )
{
if ( $opt_with_ndbcluster and $master->[0]->{'ndbcluster'} )
{
# Cluster is not started
# Call ndbcluster_start to check if test case needs cluster if ( $opt_start_and_exit or $opt_start_dirty )
# Start it if not already started
$master->[0]->{'ndbcluster'}= ndbcluster_start($tinfo->{'ndb_test'});
if ( $master->[0]->{'ndbcluster'} )
{ {
report_failure_and_restart($tinfo); mtr_report("\nServers started, exiting");
return; exit(0);
}
}
if ( ! $master->[0]->{'pid'} )
{
# FIXME not correct location for do_before_start_master()
do_before_start_master($tname,$tinfo->{'master_sh'});
$master->[0]->{'pid'}=
mysqld_start('master',0,$tinfo->{'master_opt'},[],
$using_ndbcluster_master);
if ( ! $master->[0]->{'pid'} )
{
report_failure_and_restart($tinfo);
return;
}
# Remember options used to start
$master->[0]->{'master_opt'}= $tinfo->{'master_opt'};
}
if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )
{
# Test needs cluster, start an extra mysqld connected to cluster
# First wait for first mysql server to have created ndb system tables ok
if ( ! sleep_until_file_created("$master->[0]->{'path_myddir'}/cluster/apply_status.ndb",
$master->[0]->{'start_timeout'},
$master->[0]->{'pid'}))
{
report_failure_and_restart($tinfo);
return;
}
mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");
$master->[1]->{'pid'}=
mysqld_start('master',1,$tinfo->{'master_opt'},[],
$using_ndbcluster_master);
if ( ! $master->[1]->{'pid'} )
{
report_failure_and_restart($tinfo);
return;
}
}
if ( $tinfo->{'master_restart'} )
{
# Save this test case information, so next can examine it
$master->[0]->{'running_master_is_special'}= $tinfo;
}
}
elsif ( ! $opt_skip_im and $tinfo->{'component_id'} eq 'im' )
{
# We have to create defaults file every time, in order to ensure that it
# will be the same for each test. The problem is that test can change the
# file (by SET/UNSET commands), so w/o recreating the file, execution of
# one test can affect the other.
im_create_defaults_file($instance_manager);
im_start($instance_manager, $tinfo->{im_opts});
}
# ----------------------------------------------------------------------
# Start slaves - if needed
# ----------------------------------------------------------------------
if ( $tinfo->{'slave_num'} )
{
mtr_tofile($slave->[0]->{'path_myerr'},"CURRENT_TEST: $tname\n");
do_before_start_slave($tname,$tinfo->{'slave_sh'});
for ( my $idx= 0; $idx < $tinfo->{'slave_num'}; $idx++ )
{
if ( ! $slave->[$idx]->{'pid'} )
{
$ndbcluster_opt= 0;
if ( $idx == 0)
{
if ( $slave->[0]->{'ndbcluster'} )
{
$slave->[0]->{'ndbcluster'}=
ndbcluster_start_slave($tinfo->{'ndb_test'});
if ( $slave->[0]->{'ndbcluster'} )
{
report_failure_and_restart($tinfo);
return;
}
}
$ndbcluster_opt= $using_ndbcluster_slave;
}
$slave->[$idx]->{'pid'}=
mysqld_start('slave',$idx,
$tinfo->{'slave_opt'}, $tinfo->{'slave_mi'},
$ndbcluster_opt);
if ( ! $slave->[$idx]->{'pid'} )
{
report_failure_and_restart($tinfo);
return;
}
}
}
}
}
# ----------------------------------------------------------------------
# If --start-and-exit or --start-dirty given, stop here to let user manually
# run tests
# ----------------------------------------------------------------------
if ( $opt_start_and_exit or $opt_start_dirty )
{
mtr_report("\nServers started, exiting");
exit(0);
} }
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Run the test case # Run the test case
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
mtr_report_test_name($tinfo);
{ {
# remove the old reject file # remove the old reject file
if ( $opt_suite eq "main" ) if ( $opt_suite eq "main" )
...@@ -2345,7 +2232,6 @@ sub run_testcase ($) { ...@@ -2345,7 +2232,6 @@ sub run_testcase ($) {
unlink($path_timefile); unlink($path_timefile);
my $res= run_mysqltest($tinfo); my $res= run_mysqltest($tinfo);
if ( $res == 0 ) if ( $res == 0 )
{ {
mtr_report_test_passed($tinfo); mtr_report_test_passed($tinfo);
...@@ -2369,6 +2255,7 @@ sub run_testcase ($) { ...@@ -2369,6 +2255,7 @@ sub run_testcase ($) {
"mysqltest returned unexpected code $res, " . "mysqltest returned unexpected code $res, " .
"it has probably crashed"); "it has probably crashed");
} }
report_failure_and_restart($tinfo); report_failure_and_restart($tinfo);
} }
# Save info from this testcase run to mysqltest.log # Save info from this testcase run to mysqltest.log
...@@ -2449,20 +2336,20 @@ sub restore_installed_db ($) { ...@@ -2449,20 +2336,20 @@ sub restore_installed_db ($) {
if ($opt_with_ndbcluster) if ($opt_with_ndbcluster)
{ {
# Remove the ndb_*_fs dirs, forcing a clean start of ndb # Remove the ndb_*_fs dirs, forcing a clean start of ndb
rmtree("$path_ndb_data_dir/ndb_1_fs"); rmtree("$clusters->[0]->{'data_dir'}/ndb_1_fs");
rmtree("$path_ndb_data_dir/ndb_2_fs"); rmtree("$clusters->[0]->{'data_dir'}/ndb_2_fs");
if ( $opt_with_ndbcluster_slave ) if ( $opt_with_ndbcluster_slave )
{ {
# Remove also the ndb_*_fs dirs for slave cluster # Remove also the ndb_*_fs dirs for slave cluster
rmtree("$path_ndb_slave_data_dir/ndb_1_fs"); rmtree("$clusters->[1]->{'data_dir'}/ndb_1_fs");
} }
} }
} }
else else
{ {
# No snapshot existed, just stop all processes # No snapshot existed, just stop all processes
stop_masters_slaves(); stop_all_servers();
} }
} }
...@@ -2488,7 +2375,7 @@ sub report_failure_and_restart ($) { ...@@ -2488,7 +2375,7 @@ sub report_failure_and_restart ($) {
! $glob_use_running_server and ! $glob_use_running_server and
! $glob_use_embedded_server ) ! $glob_use_embedded_server )
{ {
stop_masters_slaves(); stop_all_servers();
} }
mtr_exit(1); mtr_exit(1);
...@@ -2582,18 +2469,17 @@ sub do_before_start_slave ($$) { ...@@ -2582,18 +2469,17 @@ sub do_before_start_slave ($$) {
} }
sub mysqld_arguments ($$$$$$) { sub mysqld_arguments ($$$$$) {
my $args= shift; my $args= shift;
my $type= shift; # master/slave/bootstrap my $type= shift;
my $idx= shift; my $idx= shift;
my $extra_opt= shift; my $extra_opt= shift;
my $slave_master_info= shift; my $slave_master_info= shift;
my $using_ndbcluster= shift;
my $sidx= ""; # Index as string, 0 is empty string my $sidx= ""; # Index as string, 0 is empty string
if ( $idx > 0 ) if ( $idx > 0 )
{ {
$sidx= sprintf("%d", $idx); # sprintf not needed in Perl for this $sidx= "$idx";
} }
my $prefix= ""; # If mysqltest server arg my $prefix= ""; # If mysqltest server arg
...@@ -2634,12 +2520,12 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2634,12 +2520,12 @@ sub mysqld_arguments ($$$$$$) {
$opt_vardir, $sidx); $opt_vardir, $sidx);
} }
mtr_add_arg($args, "%s--pid-file=%s", $prefix, mtr_add_arg($args, "%s--pid-file=%s", $prefix,
$master->[$idx]->{'path_mypid'}); $master->[$idx]->{'path_pid'});
mtr_add_arg($args, "%s--port=%d", $prefix, mtr_add_arg($args, "%s--port=%d", $prefix,
$master->[$idx]->{'path_myport'}); $master->[$idx]->{'port'});
mtr_add_arg($args, "%s--server-id=%d", $prefix, $id); mtr_add_arg($args, "%s--server-id=%d", $prefix, $id);
mtr_add_arg($args, "%s--socket=%s", $prefix, mtr_add_arg($args, "%s--socket=%s", $prefix,
$master->[$idx]->{'path_mysock'}); $master->[$idx]->{'path_sock'});
mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:10M:autoextend", $prefix); mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:10M:autoextend", $prefix);
mtr_add_arg($args, "%s--local-infile", $prefix); mtr_add_arg($args, "%s--local-infile", $prefix);
mtr_add_arg($args, "%s--datadir=%s", $prefix, mtr_add_arg($args, "%s--datadir=%s", $prefix,
...@@ -2650,7 +2536,9 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2650,7 +2536,9 @@ sub mysqld_arguments ($$$$$$) {
mtr_add_arg($args, "%s--skip-innodb", $prefix); mtr_add_arg($args, "%s--skip-innodb", $prefix);
} }
if ( $opt_skip_ndbcluster || !$using_ndbcluster) my $cluster= $clusters->[$master->[$idx]->{'cluster'}];
if ( $opt_skip_ndbcluster ||
!$cluster->{'pid'})
{ {
mtr_add_arg($args, "%s--skip-ndbcluster", $prefix); mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
} }
...@@ -2658,7 +2546,7 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2658,7 +2546,7 @@ sub mysqld_arguments ($$$$$$) {
{ {
mtr_add_arg($args, "%s--ndbcluster", $prefix); mtr_add_arg($args, "%s--ndbcluster", $prefix);
mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
$opt_ndbconnectstring); $cluster->{'connect_string'});
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix); mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
} }
} }
...@@ -2684,14 +2572,14 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2684,14 +2572,14 @@ sub mysqld_arguments ($$$$$$) {
$slave->[$idx]->{'path_mylog'}); $slave->[$idx]->{'path_mylog'});
mtr_add_arg($args, "%s--master-retry-count=10", $prefix); mtr_add_arg($args, "%s--master-retry-count=10", $prefix);
mtr_add_arg($args, "%s--pid-file=%s", $prefix, mtr_add_arg($args, "%s--pid-file=%s", $prefix,
$slave->[$idx]->{'path_mypid'}); $slave->[$idx]->{'path_pid'});
mtr_add_arg($args, "%s--port=%d", $prefix, mtr_add_arg($args, "%s--port=%d", $prefix,
$slave->[$idx]->{'path_myport'}); $slave->[$idx]->{'port'});
mtr_add_arg($args, "%s--relay-log=%s/log/slave%s-relay-bin", $prefix, mtr_add_arg($args, "%s--relay-log=%s/log/slave%s-relay-bin", $prefix,
$opt_vardir, $sidx); $opt_vardir, $sidx);
mtr_add_arg($args, "%s--report-host=127.0.0.1", $prefix); mtr_add_arg($args, "%s--report-host=127.0.0.1", $prefix);
mtr_add_arg($args, "%s--report-port=%d", $prefix, mtr_add_arg($args, "%s--report-port=%d", $prefix,
$slave->[$idx]->{'path_myport'}); $slave->[$idx]->{'port'});
mtr_add_arg($args, "%s--report-user=root", $prefix); mtr_add_arg($args, "%s--report-user=root", $prefix);
mtr_add_arg($args, "%s--skip-innodb", $prefix); mtr_add_arg($args, "%s--skip-innodb", $prefix);
mtr_add_arg($args, "%s--skip-ndbcluster", $prefix); mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
...@@ -2703,7 +2591,7 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2703,7 +2591,7 @@ sub mysqld_arguments ($$$$$$) {
mtr_add_arg($args, "%s--slave-load-tmpdir=%s", $prefix, mtr_add_arg($args, "%s--slave-load-tmpdir=%s", $prefix,
"../tmp"); "../tmp");
mtr_add_arg($args, "%s--socket=%s", $prefix, mtr_add_arg($args, "%s--socket=%s", $prefix,
$slave->[$idx]->{'path_mysock'}); $slave->[$idx]->{'path_sock'});
mtr_add_arg($args, "%s--set-variable=slave_net_timeout=10", $prefix); mtr_add_arg($args, "%s--set-variable=slave_net_timeout=10", $prefix);
if ( @$slave_master_info ) if ( @$slave_master_info )
...@@ -2720,20 +2608,22 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2720,20 +2608,22 @@ sub mysqld_arguments ($$$$$$) {
mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix); mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix);
mtr_add_arg($args, "%s--master-password=", $prefix); mtr_add_arg($args, "%s--master-password=", $prefix);
mtr_add_arg($args, "%s--master-port=%d", $prefix, mtr_add_arg($args, "%s--master-port=%d", $prefix,
$master->[0]->{'path_myport'}); # First master $master->[0]->{'port'}); # First master
mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id); mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id);
mtr_add_arg($args, "%s--rpl-recovery-rank=%d", $prefix, $slave_rpl_rank); mtr_add_arg($args, "%s--rpl-recovery-rank=%d", $prefix, $slave_rpl_rank);
} }
if ( $opt_skip_ndbcluster_slave ) if ( $opt_skip_ndbcluster_slave ||
$slave->[$idx]->{'cluster'} == -1 ||
!$clusters->[$slave->[$idx]->{'cluster'}]->{'pid'} )
{ {
mtr_add_arg($args, "%s--skip-ndbcluster", $prefix); mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
} }
if ( $idx == 0 and $using_ndbcluster_slave ) else
{ {
mtr_add_arg($args, "%s--ndbcluster", $prefix); mtr_add_arg($args, "%s--ndbcluster", $prefix);
mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix, mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
$opt_ndbconnectstring_slave); $clusters->[$slave->[$idx]->{'cluster'}]->{'connect_string'});
mtr_add_arg($args, "%s--ndb-extra-logging", $prefix); mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
} }
} # end slave } # end slave
...@@ -2797,13 +2687,6 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2797,13 +2687,6 @@ sub mysqld_arguments ($$$$$$) {
mtr_add_arg($args, "%s--init-rpl-role=master", $prefix); mtr_add_arg($args, "%s--init-rpl-role=master", $prefix);
} }
# FIXME strange,.....
# FIXME MYSQL_MYPORT is not set anythere?!
if ( $opt_local_master )
{
mtr_add_arg($args, "%s--host=127.0.0.1", $prefix);
mtr_add_arg($args, "%s--port=%s", $prefix, $ENV{'MYSQL_MYPORT'});
}
} }
foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt ) foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )
...@@ -2833,23 +2716,24 @@ sub mysqld_arguments ($$$$$$) { ...@@ -2833,23 +2716,24 @@ sub mysqld_arguments ($$$$$$) {
# #
############################################################################## ##############################################################################
sub mysqld_start ($$$$$) { sub mysqld_start ($$$) {
my $type= shift; # master/slave/bootstrap my $mysqld= shift;
my $idx= shift;
my $extra_opt= shift; my $extra_opt= shift;
my $slave_master_info= shift; my $slave_master_info= shift;
my $using_ndbcluster= shift;
my $args; # Arg vector my $args; # Arg vector
my $exe; my $exe;
my $pid= -1; my $pid= -1;
my $wait_for_pid_file= 1;
my $type= $mysqld->{'type'};
my $idx= $mysqld->{'idx'};
if ( $type eq 'master' ) if ( $type eq 'master' )
{ {
$exe= $exe_master_mysqld; $exe= $exe_master_mysqld;
} }
elsif ( $type eq 'slave' ) if ( $type eq 'slave' )
{ {
$exe= $exe_slave_mysqld; $exe= $exe_slave_mysqld;
} }
...@@ -2865,8 +2749,7 @@ sub mysqld_start ($$$$$) { ...@@ -2865,8 +2749,7 @@ sub mysqld_start ($$$$$) {
valgrind_arguments($args, \$exe); valgrind_arguments($args, \$exe);
} }
mysqld_arguments($args,$type,$idx,$extra_opt,$slave_master_info, mysqld_arguments($args,$type,$idx,$extra_opt,$slave_master_info);
$using_ndbcluster);
if ( $opt_gdb || $opt_manual_gdb) if ( $opt_gdb || $opt_manual_gdb)
{ {
...@@ -2891,6 +2774,11 @@ sub mysqld_start ($$$$$) { ...@@ -2891,6 +2774,11 @@ sub mysqld_start ($$$$$) {
# Indicate the exe should not be started # Indicate the exe should not be started
$exe= undef; $exe= undef;
} }
else
{
# Default to not wait until pid file has been created
$wait_for_pid_file= 0;
}
if ($exe_libtool and $opt_valgrind) if ($exe_libtool and $opt_valgrind)
{ {
...@@ -2901,43 +2789,35 @@ sub mysqld_start ($$$$$) { ...@@ -2901,43 +2789,35 @@ sub mysqld_start ($$$$$) {
} }
if ( $type eq 'master' ) if ( defined $exe )
{ {
if ( ! defined $exe or
$pid= mtr_spawn($exe, $args, "", $pid= mtr_spawn($exe, $args, "",
$master->[$idx]->{'path_myerr'}, $mysqld->{'path_myerr'},
$master->[$idx]->{'path_myerr'}, $mysqld->{'path_myerr'},
"", "",
{ append_log_file => 1 }) ) { append_log_file => 1 });
{
return sleep_until_file_created($master->[$idx]->{'path_mypid'},
$master->[$idx]->{'start_timeout'},
$pid);
}
} }
if ( $type eq 'slave' )
{ if ( $wait_for_pid_file && !sleep_until_file_created($mysqld->{'path_pid'},
if ( ! defined $exe or $mysqld->{'start_timeout'},
$pid= mtr_spawn($exe, $args, "", $pid))
$slave->[$idx]->{'path_myerr'},
$slave->[$idx]->{'path_myerr'},
"",
{ append_log_file => 1 }) )
{ {
return sleep_until_file_created($slave->[$idx]->{'path_mypid'},
$master->[$idx]->{'start_timeout'}, mtr_error("Failed to start mysqld $mysqld->{'type'}");
$pid);
}
} }
return 0;
# Remember pid of the started process
$mysqld->{'pid'}= $pid;
mtr_verbose("mysqld pid: $pid");
return $pid;
} }
sub stop_masters_slaves () { sub stop_all_servers () {
print "Ending Tests\n"; print "Stopping All Servers\n";
if ( $instance_manager->{'pid'} ) if ( $instance_manager->{'pid'} )
{ {
...@@ -2945,72 +2825,403 @@ sub stop_masters_slaves () { ...@@ -2945,72 +2825,403 @@ sub stop_masters_slaves () {
im_stop($instance_manager); im_stop($instance_manager);
} }
print "Shutting-down MySQL daemon\n\n"; my %admin_pids; # hash of admin processes that requests shutdown
stop_masters(); my @kill_pids; # list of processes to shutdown/kill
print "Master(s) shutdown finished\n"; my $pid;
stop_slaves();
print "Slave(s) shutdown finished\n"; # Start shutdown of all started masters
foreach my $mysqld (@{$master}, @{$slave})
{
if ( $mysqld->{'pid'} )
{
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
$admin_pids{$pid}= 1;
push(@kill_pids,{
pid => $mysqld->{'pid'},
pidfile => $mysqld->{'path_pid'},
sockfile => $mysqld->{'path_sock'},
port => $mysqld->{'port'},
});
$mysqld->{'pid'}= 0; # Assume we are done with it
}
}
# Start shutdown of clusters
foreach my $cluster (@{$clusters})
{
if ( $cluster->{'pid'} )
{
$pid= mtr_ndbmgm_start($cluster, "shutdown");
$admin_pids{$pid}= 1;
push(@kill_pids,{
pid => $cluster->{'pid'},
pidfile => $cluster->{'path_pid'},
port => $cluster->{'port'},
});
$cluster->{'pid'}= 0; # Assume we are done with it
foreach my $ndbd (@{$cluster->{'ndbds'}})
{
if ( $ndbd->{'pid'} )
{
push(@kill_pids,{
pid => $ndbd->{'pid'},
pidfile => $ndbd->{'path_pid'},
});
$ndbd->{'pid'}= 0;
}
}
}
}
# Wait blocking until all shutdown processes has completed
mtr_wait_blocking(\%admin_pids);
# Make sure that process has shutdown else try to kill them
mtr_check_stop_servers(\@kill_pids);
foreach my $mysqld (@{$master}, @{$slave})
{
rm_ndbcluster_tables($mysqld->{'path_myddir'});
}
} }
sub stop_masters () { # ----------------------------------------------------------------------
# If not using a running servers we may need to stop and restart.
# We restart in the case we have initiation scripts, server options
# etc to run. But we also restart again after the test first restart
# and test is run, to get back to normal server settings.
#
# To make the code a bit more clean, we actually only stop servers
# here, and mark this to be done. Then a generic "start" part will
# start up the needed servers again.
# ----------------------------------------------------------------------
my @args; sub run_testcase_stop_servers($) {
my $tinfo= shift;
for ( my $idx; $idx < 2; $idx++ ) if ( $glob_use_running_server || $glob_use_embedded_server )
{ {
# FIXME if we hit ^C before fully started, this test will prevent return;
# the mysqld process from being killed }
if ( $master->[$idx]->{'pid'} )
# We try to find out if we are to restart the server
my $do_restart= 0; # Assumes we don't have to
if ( $tinfo->{'master_sh'} )
{ {
push(@args,{ $do_restart= 1; # Always restart if script to run
pid => $master->[$idx]->{'pid'}, mtr_report("Restart because: Always restart if script to run");
pidfile => $master->[$idx]->{'path_mypid'}, }
sockfile => $master->[$idx]->{'path_mysock'}, elsif ( $opt_with_ndbcluster and
port => $master->[$idx]->{'path_myport'}, $tinfo->{'ndb_test'} == 0 and
$clusters->[0]->{'pid'} != 0 )
{
$do_restart= 1; # Restart without cluster
mtr_report("Restart because: Test does not need cluster");
}
elsif ( $opt_with_ndbcluster and
$tinfo->{'ndb_test'} == 1 and
$clusters->[0]->{'pid'} == 0 )
{
$do_restart= 1; # Restart with cluster
mtr_report("Restart because: Test need cluster");
}
elsif ( $master->[0]->{'running_master_is_special'} and
$master->[0]->{'running_master_is_special'}->{'timezone'} eq
$tinfo->{'timezone'} and
mtr_same_opts($master->[0]->{'running_master_is_special'}->{'master_opt'},
$tinfo->{'master_opt'}) )
{
# If running master was started with special settings, but
# the current test requuires the same ones, we *don't* restart.
$do_restart= 0;
mtr_report("Skip restart: options are equal " .
join(" ", @{$tinfo->{'master_opt'}}));
}
elsif ( $tinfo->{'master_restart'} or
$master->[0]->{'running_master_is_special'} )
{
$do_restart= 1;
mtr_report("Restart because: master_restart or running_master_is_special");
}
# Check that running master was started with same options
# as the current test requires
elsif (! mtr_same_opts($master->[0]->{'master_opt'},
$tinfo->{'master_opt'}) )
{
$do_restart= 1;
mtr_report("Restart because: running with different options");
}
my $pid;
my %admin_pids; # hash of admin processes that requests shutdown
my @kill_pids; # list of processes to shutdown/kill
# Remember if we restarted for this test case
$tinfo->{'restarted'}= $do_restart;
if ( $do_restart )
{
delete $master->[0]->{'running_master_is_special'}; # Forget history
# Start shutdown of all started masters
foreach my $mysqld (@{$master})
{
if ( $mysqld->{'pid'} )
{
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
$admin_pids{$pid}= 1;
push(@kill_pids,{
pid => $mysqld->{'pid'},
pidfile => $mysqld->{'path_pid'},
sockfile => $mysqld->{'path_sock'},
port => $mysqld->{'port'},
}); });
$master->[$idx]->{'pid'}= 0; # Assume we are done with it
$mysqld->{'pid'}= 0; # Assume we are done with it
} }
} }
if ( ! $master->[0]->{'ndbcluster'} ) # Start shutdown of master cluster
my $cluster= $clusters->[0];
if ( $cluster->{'pid'} )
{
$pid= mtr_ndbmgm_start($cluster, "shutdown");
$admin_pids{$pid}= 1;
push(@kill_pids,{
pid => $cluster->{'pid'},
pidfile => $cluster->{'path_pid'},
port => $cluster->{'port'},
});
$cluster->{'pid'}= 0; # Assume we are done with it
foreach my $ndbd (@{$cluster->{'ndbds'}})
{ {
ndbcluster_stop(); push(@kill_pids,{
$master->[0]->{'ndbcluster'}= 1; pid => $ndbd->{'pid'},
pidfile => $ndbd->{'path_pid'},
});
$ndbd->{'pid'}= 0; # Assume we are done with it
}
}
} }
mtr_stop_mysqld_servers(\@args);
}
# ----------------------------------------------------------------------
# Always terminate all slaves, if any. Else we may have useless
# reconnection attempts and error messages in case the slave and
# master servers restart.
# ----------------------------------------------------------------------
# Start shutdown of all started slaves
foreach my $mysqld (@{$slave})
{
if ( $mysqld->{'pid'} )
{
$pid= mtr_mysqladmin_start($mysqld, "shutdown", 70);
$admin_pids{$pid}= 1;
sub stop_slaves () { push(@kill_pids,{
my $force= shift; pid => $mysqld->{'pid'},
pidfile => $mysqld->{'path_pid'},
sockfile => $mysqld->{'path_sock'},
port => $mysqld->{'port'},
});
my @args;
for ( my $idx; $idx < 3; $idx++ ) $mysqld->{'pid'}= 0; # Assume we are done with it
}
}
# Start shutdown of slave cluster
my $cluster= $clusters->[1];
if ( $cluster->{'pid'} )
{ {
if ( $slave->[$idx]->{'pid'} ) $pid= mtr_ndbmgm_start($cluster, "shutdown");
$admin_pids{$pid}= 1;
push(@kill_pids,{
pid => $cluster->{'pid'},
pidfile => $cluster->{'path_pid'},
port => $cluster->{'port'},
});
$cluster->{'pid'}= 0; # Assume we are done with it
foreach my $ndbd (@{$cluster->{'ndbds'}} )
{ {
push(@args,{ push(@kill_pids,{
pid => $slave->[$idx]->{'pid'}, pid => $ndbd->{'pid'},
pidfile => $slave->[$idx]->{'path_mypid'}, pidfile => $ndbd->{'path_pid'},
sockfile => $slave->[$idx]->{'path_mysock'},
port => $slave->[$idx]->{'path_myport'},
}); });
$slave->[$idx]->{'pid'}= 0; # Assume we are done with it $ndbd->{'pid'}= 0; # Assume we are done with it
}
}
# ----------------------------------------------------------------------
# Shutdown has now been started and lists for the shutdown processes
# and the processes to be killed has been created
# ----------------------------------------------------------------------
# Wait blocking until all shutdown processes has completed
mtr_wait_blocking(\%admin_pids);
# Make sure that process has shutdown else try to kill them
mtr_check_stop_servers(\@kill_pids);
foreach my $mysqld (@{$master}, @{$slave})
{
if ( ! $mysqld->{'pid'} )
{
rm_ndbcluster_tables($mysqld->{'path_myddir'});
}
}
}
sub workaround_hang_in_select($$) {
my $tinfo= shift;
my $mysqld= shift;
# Wait until mysqld has started and created apply_status table
# FIXME this is a workaround for mysqld not being able to shutdown
# before having connected to ndb_mgmd
if ( ! sleep_until_file_created("$mysqld->{'path_myddir'}/cluster/apply_status.ndb",
$mysqld->{'start_timeout'},
$mysqld->{'pid'}))
{
mtr_report("Failed to create 'cluster/apply_status' table");
report_failure_and_restart($tinfo);
return;
}
}
sub run_testcase_start_servers($) {
my $tinfo= shift;
my $tname= $tinfo->{'name'};
if ( $glob_use_running_server or $glob_use_embedded_server )
{
return;
}
if ( $tinfo->{'component_id'} eq 'mysqld' )
{
if ( $opt_with_ndbcluster and
!$clusters->[0]->{'pid'} and
$tinfo->{'ndb_test'} )
{
# Test need cluster, cluster is not started, start it
ndbcluster_start($clusters->[0], "");
} }
if ( !$master->[0]->{'pid'} )
{
# Master mysqld is not started
do_before_start_master($tname,$tinfo->{'master_sh'});
mysqld_start($master->[0],$tinfo->{'master_opt'},[]);
# Remember options used to start
$master->[0]->{'master_opt'}= $tinfo->{'master_opt'};
} }
if ( ! $slave->[0]->{'ndbcluster'} ) if ( $clusters->[0]->{'pid'} and ! $master->[1]->{'pid'} )
{
# Test needs cluster, start an extra mysqld connected to cluster
# First wait for first mysql server to have created ndb system tables ok
# FIXME This is a workaround so that only one mysqld creates the tables
if ( ! sleep_until_file_created(
"$master->[0]->{'path_myddir'}/cluster/apply_status.ndb",
$master->[0]->{'start_timeout'},
$master->[0]->{'pid'}))
{ {
ndbcluster_stop_slave(); mtr_report("Failed to create 'cluster/apply_status' table");
$slave->[0]->{'ndbcluster'}= 1; report_failure_and_restart($tinfo);
return;
}
mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");
mysqld_start($master->[1],$tinfo->{'master_opt'},[]);
} }
mtr_stop_mysqld_servers(\@args); if ( $tinfo->{'master_restart'} )
{
# Save this test case information, so next can examine it
$master->[0]->{'running_master_is_special'}= $tinfo;
}
}
elsif ( ! $opt_skip_im and $tinfo->{'component_id'} eq 'im' )
{
# We have to create defaults file every time, in order to ensure that it
# will be the same for each test. The problem is that test can change the
# file (by SET/UNSET commands), so w/o recreating the file, execution of
# one test can affect the other.
im_create_defaults_file($instance_manager);
im_start($instance_manager, $tinfo->{im_opts});
}
# ----------------------------------------------------------------------
# Start slaves - if needed
# ----------------------------------------------------------------------
if ( $tinfo->{'slave_num'} )
{
mtr_tofile($slave->[0]->{'path_myerr'},"CURRENT_TEST: $tname\n");
do_before_start_slave($tname,$tinfo->{'slave_sh'});
if ( $opt_with_ndbcluster and
!$clusters->[1]->{'pid'} and
$tinfo->{'ndb_test'} )
{
# Test need slave cluster, cluster is not started, start it
ndbcluster_start($clusters->[1], "");
}
for ( my $idx= 0; $idx < $tinfo->{'slave_num'}; $idx++ )
{
if ( ! $slave->[$idx]->{'pid'} )
{
mysqld_start($slave->[$idx],$tinfo->{'slave_opt'},
$tinfo->{'slave_mi'});
}
}
}
if ( $clusters->[0]->{'pid'} and $master->[1]->{'pid'} )
{
# Test needs cluster, extra mysqld started
workaround_hang_in_select($tinfo, $master->[1]);
}
if ( $tinfo->{'slave_num'} and
$clusters->[0]->{'pid'} and
$slave->[0]->{'pid'} )
{
# Slaves are started, test needs cluster, slave mysqld started
workaround_hang_in_select($tinfo, $slave->[0]);
}
} }
############################################################################## ##############################################################################
# #
# Instance Manager management routines. # Instance Manager management routines.
...@@ -3188,8 +3399,8 @@ sub run_check_testcase ($) { ...@@ -3188,8 +3399,8 @@ sub run_check_testcase ($) {
mtr_add_arg($args, "--skip-safemalloc"); mtr_add_arg($args, "--skip-safemalloc");
mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir); mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir);
mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_mysock'}); mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_sock'});
mtr_add_arg($args, "--port=%d", $master->[0]->{'path_myport'}); mtr_add_arg($args, "--port=%d", $master->[0]->{'port'});
mtr_add_arg($args, "--database=test"); mtr_add_arg($args, "--database=test");
mtr_add_arg($args, "--user=%s", $opt_user); mtr_add_arg($args, "--user=%s", $opt_user);
mtr_add_arg($args, "--password="); mtr_add_arg($args, "--password=");
...@@ -3223,8 +3434,8 @@ sub run_mysqltest ($) { ...@@ -3223,8 +3434,8 @@ sub run_mysqltest ($) {
my $tinfo= shift; my $tinfo= shift;
my $cmdline_mysqlcheck= "$exe_mysqlcheck --no-defaults -uroot " . my $cmdline_mysqlcheck= "$exe_mysqlcheck --no-defaults -uroot " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_mysock'} --password="; "--socket=$master->[0]->{'path_sock'} --password=";
if ( $opt_debug ) if ( $opt_debug )
{ {
$cmdline_mysqlcheck .= $cmdline_mysqlcheck .=
...@@ -3232,11 +3443,11 @@ sub run_mysqltest ($) { ...@@ -3232,11 +3443,11 @@ sub run_mysqltest ($) {
} }
my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " . my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_mysock'} --password="; "--socket=$master->[0]->{'path_sock'} --password=";
my $cmdline_mysqldumpslave= "$exe_mysqldump --no-defaults -uroot " . my $cmdline_mysqldumpslave= "$exe_mysqldump --no-defaults -uroot " .
"--socket=$slave->[0]->{'path_mysock'} --password="; "--socket=$slave->[0]->{'path_sock'} --password=";
if ( $opt_debug ) if ( $opt_debug )
{ {
...@@ -3249,8 +3460,8 @@ sub run_mysqltest ($) { ...@@ -3249,8 +3460,8 @@ sub run_mysqltest ($) {
unless ( $glob_win32 ) unless ( $glob_win32 )
{ {
$cmdline_mysqlslap= "$exe_mysqlslap -uroot " . $cmdline_mysqlslap= "$exe_mysqlslap -uroot " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_mysock'} --password= " . "--socket=$master->[0]->{'path_sock'} --password= " .
"--lock-directory=$opt_tmpdir"; "--lock-directory=$opt_tmpdir";
if ( $opt_debug ) if ( $opt_debug )
{ {
...@@ -3260,8 +3471,8 @@ sub run_mysqltest ($) { ...@@ -3260,8 +3471,8 @@ sub run_mysqltest ($) {
} }
my $cmdline_mysqlimport= "$exe_mysqlimport -uroot " . my $cmdline_mysqlimport= "$exe_mysqlimport -uroot " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_mysock'} --password="; "--socket=$master->[0]->{'path_sock'} --password=";
if ( $opt_debug ) if ( $opt_debug )
{ {
$cmdline_mysqlimport .= $cmdline_mysqlimport .=
...@@ -3269,8 +3480,8 @@ sub run_mysqltest ($) { ...@@ -3269,8 +3480,8 @@ sub run_mysqltest ($) {
} }
my $cmdline_mysqlshow= "$exe_mysqlshow -uroot " . my $cmdline_mysqlshow= "$exe_mysqlshow -uroot " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_mysock'} --password="; "--socket=$master->[0]->{'path_sock'} --password=";
if ( $opt_debug ) if ( $opt_debug )
{ {
$cmdline_mysqlshow .= $cmdline_mysqlshow .=
...@@ -3290,13 +3501,13 @@ sub run_mysqltest ($) { ...@@ -3290,13 +3501,13 @@ sub run_mysqltest ($) {
my $cmdline_mysql= my $cmdline_mysql=
"$exe_mysql --host=localhost --user=root --password= " . "$exe_mysql --host=localhost --user=root --password= " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_mysock'}"; "--socket=$master->[0]->{'path_sock'}";
my $cmdline_mysql_client_test= my $cmdline_mysql_client_test=
"$exe_mysql_client_test --no-defaults --testcase --user=root --silent " . "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_mysock'}"; "--socket=$master->[0]->{'path_sock'}";
if ( $glob_use_embedded_server ) if ( $glob_use_embedded_server )
{ {
...@@ -3309,8 +3520,8 @@ sub run_mysqltest ($) { ...@@ -3309,8 +3520,8 @@ sub run_mysqltest ($) {
my $cmdline_mysql_fix_system_tables= my $cmdline_mysql_fix_system_tables=
"$exe_mysql_fix_system_tables --no-defaults --host=localhost --user=root --password= " . "$exe_mysql_fix_system_tables --no-defaults --host=localhost --user=root --password= " .
"--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " . "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
"--port=$master->[0]->{'path_myport'} " . "--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_mysock'}"; "--socket=$master->[0]->{'path_sock'}";
$ENV{'MYSQL'}= $cmdline_mysql; $ENV{'MYSQL'}= $cmdline_mysql;
$ENV{'MYSQL_CHECK'}= $cmdline_mysqlcheck; $ENV{'MYSQL_CHECK'}= $cmdline_mysqlcheck;
...@@ -3327,12 +3538,12 @@ sub run_mysqltest ($) { ...@@ -3327,12 +3538,12 @@ sub run_mysqltest ($) {
$ENV{'UDF_EXAMPLE_LIB'}= $ENV{'UDF_EXAMPLE_LIB'}=
($lib_udf_example ? basename($lib_udf_example) : ""); ($lib_udf_example ? basename($lib_udf_example) : "");
$ENV{'NDB_STATUS_OK'}= $flag_ndb_status_ok ? "YES" : "NO"; $ENV{'NDB_STATUS_OK'}= $clusters->[0]->{'installed_ok'};
$ENV{'NDB_SLAVE_STATUS_OK'}= $flag_ndb_slave_status_ok ? "YES" : "NO"; $ENV{'NDB_SLAVE_STATUS_OK'}= $clusters->[0]->{'installed_ok'};;
$ENV{'NDB_EXTRA_TEST'}= $opt_ndb_extra_test; $ENV{'NDB_EXTRA_TEST'}= $opt_ndb_extra_test;
$ENV{'NDB_MGM'}= $exe_ndb_mgm; $ENV{'NDB_MGM'}= $exe_ndb_mgm;
$ENV{'NDB_BACKUP_DIR'}= $path_ndb_data_dir; $ENV{'NDB_BACKUP_DIR'}= $clusters->[0]->{'data_dir'};
$ENV{'NDB_DATA_DIR'}= $path_ndb_data_dir; $ENV{'NDB_DATA_DIR'}= $clusters->[0]->{'data_dir'};
$ENV{'NDB_TOOLS_DIR'}= $path_ndb_tools_dir; $ENV{'NDB_TOOLS_DIR'}= $path_ndb_tools_dir;
$ENV{'NDB_TOOLS_OUTPUT'}= $file_ndb_testrun_log; $ENV{'NDB_TOOLS_OUTPUT'}= $file_ndb_testrun_log;
$ENV{'NDB_CONNECTSTRING'}= $opt_ndbconnectstring; $ENV{'NDB_CONNECTSTRING'}= $opt_ndbconnectstring;
...@@ -3357,8 +3568,8 @@ sub run_mysqltest ($) { ...@@ -3357,8 +3568,8 @@ sub run_mysqltest ($) {
} }
else # component_id == mysqld else # component_id == mysqld
{ {
mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_mysock'}); mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_sock'});
mtr_add_arg($args, "--port=%d", $master->[0]->{'path_myport'}); mtr_add_arg($args, "--port=%d", $master->[0]->{'port'});
mtr_add_arg($args, "--database=test"); mtr_add_arg($args, "--database=test");
mtr_add_arg($args, "--user=%s", $opt_user); mtr_add_arg($args, "--user=%s", $opt_user);
mtr_add_arg($args, "--password="); mtr_add_arg($args, "--password=");
...@@ -3445,7 +3656,7 @@ sub run_mysqltest ($) { ...@@ -3445,7 +3656,7 @@ sub run_mysqltest ($) {
if ( $glob_use_embedded_server ) if ( $glob_use_embedded_server )
{ {
mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[],0); mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]);
} }
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -3823,6 +4034,7 @@ Misc options ...@@ -3823,6 +4034,7 @@ Misc options
comment=STR Write STR to the output comment=STR Write STR to the output
notimer Don't show test case execution time notimer Don't show test case execution time
script-debug Debug this script itself script-debug Debug this script itself
verbose More verbose output
start-and-exit Only initialize and start the servers, using the start-and-exit Only initialize and start the servers, using the
startup settings for the specified test case (if any) startup settings for the specified test case (if any)
start-dirty Only start the servers (without initialization) for start-dirty Only start the servers (without initialization) for
......
storage/ndb/tools/waiter.cpp
View file @ 4f0bda6a
...@@ -92,7 +92,7 @@ int main(int argc, char** argv){ ...@@ -92,7 +92,7 @@ int main(int argc, char** argv){
wait_status= NDB_MGM_NODE_STATUS_STARTED; wait_status= NDB_MGM_NODE_STATUS_STARTED;
} }
if (waitClusterStatus(_hostName, wait_status, _timeout) != 0) if (waitClusterStatus(_hostName, wait_status, _timeout*10) != 0)
return NDBT_ProgramExit(NDBT_FAILED); return NDBT_ProgramExit(NDBT_FAILED);
return NDBT_ProgramExit(NDBT_OK); return NDBT_ProgramExit(NDBT_OK);
} }
...@@ -311,7 +311,7 @@ waitClusterStatus(const char* _addr, ...@@ -311,7 +311,7 @@ waitClusterStatus(const char* _addr,
} }
g_info << "Waiting for cluster enter state " g_info << "Waiting for cluster enter state "
<< ndb_mgm_get_node_status_string(_status)<< endl; << ndb_mgm_get_node_status_string(_status)<< endl;
NdbSleep_SecSleep(1); NdbSleep_MilliSleep(100);
attempts++; attempts++;
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7