database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug #43418 MTR2: does not notice a memory leak occuring at shutdown of mysqld w/ --valgrind

Browse Source 
Follow-up discussed with Reporter:
Avoid hard shutdown after test failure, if caused by server log warning
  AND we are running valgrind
More general pick-up of valgrind summaries, order may apparently vary
Do exit(1) if we did find valgrind summary warnings
This commit is contained in:
Bjorn Munch
2010-11-23 14:34:00 +01:00
parent 32ea070845
commit b768d7fdef
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,7 +568,10 @@ sub run_test_server ($$$) {
if ( !$opt_force ) { if ( !$opt_force ) {
# Test has failed, force is off # Test has failed, force is off
push(@$completed, $result); push(@$completed, $result);
return $completed; return $completed unless $result->{'dont_kill_server'};
# Prevent kill of server, to get valgrind report
print $sock "BYE\n";
next;
} }
elsif ($opt_max_test_fail > 0 and elsif ($opt_max_test_fail > 0 and
$num_failed_test >= $opt_max_test_fail) { $num_failed_test >= $opt_max_test_fail) {
@ -808,13 +811,14 @@ sub run_worker ($) {
elsif ($line eq 'BYE'){ elsif ($line eq 'BYE'){
mtr_report("Server said BYE"); mtr_report("Server said BYE");
stop_all_servers($opt_shutdown_timeout); stop_all_servers($opt_shutdown_timeout);
my $valgrind_reports= 0;
if ($opt_valgrind_mysqld) { if ($opt_valgrind_mysqld) {
valgrind_exit_reports(); $valgrind_reports= valgrind_exit_reports();
} }
if ( $opt_gprof ) { if ( $opt_gprof ) {
gprof_collect (find_mysqld($basedir), keys %gprof_dirs); gprof_collect (find_mysqld($basedir), keys %gprof_dirs);
} }
exit(0); exit($valgrind_reports);
} }
else { else {
mtr_error("Could not understand server, '$line'"); mtr_error("Could not understand server, '$line'");
@ -4232,7 +4236,12 @@ sub after_failure ($) {
sub report_failure_and_restart ($) { sub report_failure_and_restart ($) {
my $tinfo= shift; my $tinfo= shift;
stop_all_servers(); if ($opt_valgrind_mysqld && ($tinfo->{'warnings'} || $tinfo->{'timeout'})) {
# In these cases we may want valgrind report from normal termination
$tinfo->{'dont_kill_server'}= 1;
}
# Shotdown properly if not to be killed (for valgrind)
stop_all_servers($tinfo->{'dont_kill_server'} ? $opt_shutdown_timeout : 0);
$tinfo->{'result'}= 'MTR_RES_FAILED'; $tinfo->{'result'}= 'MTR_RES_FAILED';
@ -5359,6 +5368,8 @@ sub valgrind_arguments {
# #
sub valgrind_exit_reports() { sub valgrind_exit_reports() {
my $found_err= 0;
foreach my $log_file (keys %mysqld_logs) foreach my $log_file (keys %mysqld_logs)
{ {
my @culprits= (); my @culprits= ();
@ -5394,7 +5405,7 @@ sub valgrind_exit_reports() {
next; next;
} }
# This line marks the start of a valgrind report # This line marks the start of a valgrind report
$found_report= 1 if $line =~ /ERROR SUMMARY:/; $found_report= 1 if $line =~ /^==\d+== .* SUMMARY:/;
if ($found_report) { if ($found_report) {
$line=~ s/^==\d+== //; $line=~ s/^==\d+== //;
@ -5411,8 +5422,11 @@ sub valgrind_exit_reports() {
mtr_print ("Valgrind report from $log_file after tests:\n", @culprits); mtr_print ("Valgrind report from $log_file after tests:\n", @culprits);
mtr_print_line(); mtr_print_line();
print ("$valgrind_rep\n"); print ("$valgrind_rep\n");
$found_err= 1;
} }
} }
return $found_err;
} }
# #