1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-29025 Refactoring: moved out core_wanted() out of mysql-test-run.pl

Browse Source
This commit is contained in:
Aleksey Midenkov 2022-07-18 23:16:17 +03:00
parent e9be5428a2
commit 1bdcffb028
2 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mysql-test/lib/My/CoreDump.pm
View File

@ -23,6 +23,8 @@ use Text::Wrap;
use Data::Dumper; use Data::Dumper;
use File::Temp qw/ tempfile tempdir /; use File::Temp qw/ tempfile tempdir /;
use File::Find;
use File::Basename;
use mtr_results; use mtr_results;
use mtr_report; use mtr_report;
@ -489,7 +491,7 @@ sub _auto
sub show { sub show {
my ($class, $core_name, $exe_mysqld, $parallel)= @_; my ($core_name, $exe_mysqld, $parallel)= @_;
if ($config{print_core} ne 'no') { if ($config{print_core} ne 'no') {
my $f= $config{print_core}; my $f= $config{print_core};
my $m= $config{print_method}; my $m= $config{print_method};
@ -506,4 +508,36 @@ sub show {
} }
sub core_wanted($$$$$) {
my ($num_saved_cores, $opt_max_save_core, $compress,
$exe_mysqld, $opt_parallel)= @_;
my $core_file= $File::Find::name;
my $core_name= basename($core_file);
# Name beginning with core, not ending in .gz
if (($core_name =~ /^core/ and $core_name !~ /\.gz$/)
or (IS_WINDOWS and $core_name =~ /\.dmp$/))
{
# Ending with .dmp
mtr_report(" - found '$core_name'",
"($$num_saved_cores/$opt_max_save_core)");
show($core_file, $exe_mysqld, $opt_parallel);
# Limit number of core files saved
if ($$num_saved_cores >= $opt_max_save_core)
{
mtr_report(" - deleting it, already saved",
"$opt_max_save_core");
unlink("$core_file");
}
else
{
main::mtr_compress_file($core_file) if $compress;
++$$num_saved_cores;
}
}
}
1; 1;

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

@ -801,32 +801,10 @@ sub run_test_server ($$$) {
no_chdir => 1, no_chdir => 1,
wanted => sub wanted => sub
{ {
my $core_file= $File::Find::name; My::CoreDump::core_wanted(\$num_saved_cores,
my $core_name= basename($core_file); $opt_max_save_core,
@opt_cases == 0,
# Name beginning with core, not ending in .gz $exe_mysqld, $opt_parallel);
if (($core_name =~ /^core/ and $core_name !~ /\.gz$/)
or (IS_WINDOWS and $core_name =~ /\.dmp$/))
{
# Ending with .dmp
mtr_report(" - found '$core_name'",
"($num_saved_cores/$opt_max_save_core)");
My::CoreDump->show($core_file, $exe_mysqld, $opt_parallel);
# Limit number of core files saved
if ($num_saved_cores >= $opt_max_save_core)
{
mtr_report(" - deleting it, already saved",
"$opt_max_save_core");
unlink("$core_file");
}
else
{
mtr_compress_file($core_file) unless @opt_cases;
++$num_saved_cores;
}
}
} }
}, },
$worker_savedir); $worker_savedir);