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

Merge pull request #214 from jfcoz/innodb_space

Browse source 
add innodb when innodb_file_per_table is ON
This commit is contained in:
Jean-Marie Renouard 2016-06-02 14:55:04 +02:00
commit 38dbf6e6ec
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mysqltuner.pl
View file

@ -938,6 +938,7 @@ sub arr2hash {
my $sep = shift; my $sep = shift;
$sep = '\s' unless defined($sep); $sep = '\s' unless defined($sep);
foreach my $line (@$harr) { foreach my $line (@$harr) {
next if ($line =~ m/^\*\*\*\*\*\*\*/);
$line =~ /([a-zA-Z_]*)\s*$sep\s*(.*)/; $line =~ /([a-zA-Z_]*)\s*$sep\s*(.*)/;
$$href{$1} = $2; $$href{$1} = $2;
debugprint "V: $1 = $2"; debugprint "V: $1 = $2";
@ -953,12 +954,12 @@ sub get_all_vars {
my @mysqlvarlist = select_array("SHOW VARIABLES"); my @mysqlvarlist = select_array("SHOW VARIABLES");
push( @mysqlvarlist, select_array("SHOW GLOBAL VARIABLES") ); push( @mysqlvarlist, select_array("SHOW GLOBAL VARIABLES") );
arr2hash( \%myvar, \@mysqlvarlist ); arr2hash( \%myvar, \@mysqlvarlist );
$result{'Variables'} = %myvar; $result{'Variables'} = \%myvar;
my @mysqlstatlist = select_array("SHOW STATUS"); my @mysqlstatlist = select_array("SHOW STATUS");
push( @mysqlstatlist, select_array("SHOW GLOBAL STATUS") ); push( @mysqlstatlist, select_array("SHOW GLOBAL STATUS") );
arr2hash( \%mystat, \@mysqlstatlist ); arr2hash( \%mystat, \@mysqlstatlist );
$result{'Status'} = %mystat; $result{'Status'} = \%mystat;
$myvar{'have_galera'} = "NO"; $myvar{'have_galera'} = "NO";
if ( defined( $myvar{'wsrep_provider_options'} ) if ( defined( $myvar{'wsrep_provider_options'} )
@ -1002,7 +1003,7 @@ sub get_all_vars {
debugprint Dumper(@mysqlenginelist); debugprint Dumper(@mysqlenginelist);
my @mysqlslave = select_array("SHOW SLAVE STATUS\\G"); my @mysqlslave = select_array("SHOW SLAVE STATUS\\G");
arr2hash( \%myrepl, \@mysqlslave, ':' ); arr2hash( \%myrepl, \@mysqlslave, ':' );
$result{'Replication'}{'Status'} = %myrepl; $result{'Replication'}{'Status'} = \%myrepl;
my @mysqlslaves = select_array "SHOW SLAVE HOSTS"; my @mysqlslaves = select_array "SHOW SLAVE HOSTS";
my @lineitems = (); my @lineitems = ();
foreach my $line (@mysqlslaves) { foreach my $line (@mysqlslaves) {
@ -1775,13 +1776,15 @@ sub check_storage_engines {
$result{'Engine'}{$engine}{'Data Size'} = $dsize; $result{'Engine'}{$engine}{'Data Size'} = $dsize;
$result{'Engine'}{$engine}{'Index Size'} = $isize; $result{'Engine'}{$engine}{'Index Size'} = $isize;
} }
$fragtables = select_one my $not_innodb='';
"SELECT COUNT(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','performance_schema', 'mysql') AND Data_free > 0 AND NOT ENGINE='MEMORY' AND NOT ENGINE='InnoDB'"; if ($result{'Variables'}{'innodb_file_per_table'} eq 'OFF') {
chomp($fragtables); $not_innodb="AND NOT ENGINE='InnoDB'";
}
$result{'Tables'}{'Fragmented tables'} = $result{'Tables'}{'Fragmented tables'} =
[ select_array [ select_array
"SELECT CONCAT(CONCAT(TABLE_SCHEMA, '.'), TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','performance_schema', 'mysql') AND Data_free > 0 AND NOT ENGINE='MEMORY' AND NOT ENGINE='InnoDB'" "SELECT CONCAT(CONCAT(TABLE_SCHEMA, '.'), TABLE_NAME),DATA_FREE FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','performance_schema', 'mysql') AND DATA_LENGTH/1024/1024>100 AND DATA_FREE*100/(DATA_LENGTH+INDEX_LENGTH+DATA_FREE) > 10 AND NOT ENGINE='MEMORY' $not_innodb"
]; ];
$fragtables = scalar @{$result{'Tables'}{'Fragmented tables'}};
} }
else { else {
@ -1870,6 +1873,16 @@ sub check_storage_engines {
badprint "Total fragmented tables: $fragtables"; badprint "Total fragmented tables: $fragtables";
push( @generalrec, push( @generalrec,
"Run OPTIMIZE TABLE to defragment tables for better performance" ); "Run OPTIMIZE TABLE to defragment tables for better performance" );
my $total_free=0;
foreach my $table_line (@{$result{'Tables'}{'Fragmented tables'}}) {
my ($table_name,$data_free)=split(/\s+/,$table_line);
$data_free=$data_free/1024/1024;
$total_free+=$data_free;
push( @generalrec,
" OPTIMZE TABLE $table_name; -- can free $data_free MB");
}
push( @generalrec,
"Total freed space after theses OPTIMIZE TABLE : $total_free Mb" );
} }
else { else {
goodprint "Total fragmented tables: $fragtables"; goodprint "Total fragmented tables: $fragtables";