hhf/MySQLTuner-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #679 from jmrenouard/master

Browse source 
Fixing wrong calculation in memory usage (regression found)
This commit is contained in:
Jean-Marie Renouard 2023-06-18 22:00:41 +02:00 committed by GitHub
commit 5ccb6f9cd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
mysqltuner.pl
View file

@ -1,5 +1,5 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# mysqltuner.pl - Version 2.1.6 # mysqltuner.pl - Version 2.1.7
# High Performance MySQL Tuning Script # High Performance MySQL Tuning Script
# Copyright (C) 2006-2023 Major Hayden - major@mhtx.net # Copyright (C) 2006-2023 Major Hayden - major@mhtx.net
# Copyright (C) 2015-2023 Jean-Marie Renouard - jmrenouard@gmail.com # Copyright (C) 2015-2023 Jean-Marie Renouard - jmrenouard@gmail.com
@ -57,7 +57,7 @@ use Cwd 'abs_path';
#use Env; #use Env;
# Set up a few variables for use in the script # Set up a few variables for use in the script
my $tunerversion = "2.1.6"; my $tunerversion = "2.1.7";
my ( @adjvars, @generalrec ); my ( @adjvars, @generalrec );
# Set defaults # Set defaults
@ -334,7 +334,21 @@ sub is_remote() {
return 0 if ( $host eq '127.0.0.1' ); return 0 if ( $host eq '127.0.0.1' );
return 1; return 1;
} }
sub is_int {
return 0 unless defined $_[0];
my $str = $_[0];
#trim whitespace both sides
$str =~ s/^\s+|\s+$//g;
#Alternatively, to match any float-like numeric, use:
# m/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/
#flatten to string and match dash or plus and one or more digits
if ($str =~ /^(\-|\+)?\d+?$/) {
return 1;
}
return 0;
}
# Calculates the number of physical cores considering HyperThreading # Calculates the number of physical cores considering HyperThreading
sub cpu_cores { sub cpu_cores {
if ( $^O eq 'linux' ) { if ( $^O eq 'linux' ) {
@ -2730,26 +2744,23 @@ sub calculations {
} }
# Per-thread memory # Per-thread memory
# Per-thread memory $mycalc{'per_thread_buffers'} = 0;
if ( mysql_version_ge(4) ) { $mycalc{'per_thread_buffers'} += $myvar{'read_buffer_size'} if is_int($myvar{'read_buffer_size'});
$mycalc{'per_thread_buffers'} = $mycalc{'per_thread_buffers'} += $myvar{'read_rnd_buffer_size'} if is_int($myvar{'read_rnd_buffer_size'});
$myvar{'read_buffer_size'} + $mycalc{'per_thread_buffers'} += $myvar{'sort_buffer_size'} if is_int($myvar{'sort_buffer_size'});
$myvar{'read_rnd_buffer_size'} + $mycalc{'per_thread_buffers'} += $myvar{'thread_stack'} if is_int($myvar{'thread_stack'});
$myvar{'sort_buffer_size'} + $mycalc{'per_thread_buffers'} += $myvar{'join_buffer_size'} if is_int($myvar{'join_buffer_size'});
$myvar{'thread_stack'} + $mycalc{'per_thread_buffers'} += $myvar{'binlog_cache_size'} if is_int($myvar{'binlog_cache_size'});
$myvar{'max_allowed_packet'} + debugprint "per_thread_buffers: $mycalc{'per_thread_buffers'} (" .human_size($mycalc{'per_thread_buffers'} ) ." )";
$myvar{'join_buffer_size'};
} # Error max_allowed_packet is not included in thread buffers size
else { #$mycalc{'per_thread_buffers'} += $myvar{'max_allowed_packet'} if is_int($myvar{'max_allowed_packet'});
$mycalc{'per_thread_buffers'} =
$myvar{'record_buffer'} + # Total per-thread memory
$myvar{'record_rnd_buffer'} +
$myvar{'sort_buffer'} +
$myvar{'thread_stack'} +
$myvar{'join_buffer_size'};
}
$mycalc{'total_per_thread_buffers'} = $mycalc{'total_per_thread_buffers'} =
$mycalc{'per_thread_buffers'} * $myvar{'max_connections'}; $mycalc{'per_thread_buffers'} * $myvar{'max_connections'};
# Max total per-thread memory reached
$mycalc{'max_total_per_thread_buffers'} = $mycalc{'max_total_per_thread_buffers'} =
$mycalc{'per_thread_buffers'} * $mystat{'Max_used_connections'}; $mycalc{'per_thread_buffers'} * $mystat{'Max_used_connections'};
@ -7059,7 +7070,7 @@ __END__
=head1 NAME =head1 NAME
MySQLTuner 2.1.6 - MySQL High Performance Tuning Script MySQLTuner 2.1.7 - MySQL High Performance Tuning Script
=head1 IMPORTANT USAGE GUIDELINES =head1 IMPORTANT USAGE GUIDELINES