percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 21:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged fix-844880-variableadvisor-bin_log-checks

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-08-01 14:47:50 -03:00
parent 9ece80c756 43708d7b65
commit 66d6ed75c0
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/pt-variable-advisor
View File

@@ -3202,7 +3202,7 @@ sub get_rules {
code => sub {
my ( %args ) = @_;
return _var_eq($args{variables}->{expire_log_days}, 0)
&& $args{variables}->{log_bin} ? 1 : 0;
&& _var_seq($args{variables}->{log_bin}, "ON");
},
},
{
@@ -3235,7 +3235,7 @@ sub get_rules {
code => sub {
my ( %args ) = @_;
return _var_seq($args{variables}->{innodb_locks_unsafe_for_binlog},
"ON") && $args{variables}->{log_bin} ? 1 : 0;
"ON") && _var_seq($args{variables}->{log_bin}, "ON");
},
},
{
@@ -3243,7 +3243,7 @@ sub get_rules {
code => sub {
my ( %args ) = @_;
return _var_sneq($args{variables}->{innodb_support_xa}, "ON")
&& $args{variables}->{log_bin} ? 1 : 0;
&& _var_seq($args{variables}->{log_bin}, "ON");
},
},
{
@@ -3291,7 +3291,7 @@ sub get_rules {
code => sub {
my ( %args ) = @_;
return
$args{variables}->{log_bin}
_var_seq($args{variables}->{log_bin}, "ON")
&& ( _var_eq($args{variables}->{sync_binlog}, 0)
|| _var_gt($args{variables}->{sync_binlog}, 1)) ? 1 : 0;
},

8
lib/VariableAdvisorRules.pm
View File

@@ -431,7 +431,7 @@ sub get_rules {
code => sub {
my ( %args ) = @_;
return _var_eq($args{variables}->{expire_log_days}, 0)
&& $args{variables}->{log_bin} ? 1 : 0;
&& _var_seq($args{variables}->{log_bin}, "ON");
},
},
{
@@ -464,7 +464,7 @@ sub get_rules {
code => sub {
my ( %args ) = @_;
return _var_seq($args{variables}->{innodb_locks_unsafe_for_binlog},
"ON") && $args{variables}->{log_bin} ? 1 : 0;
"ON") && _var_seq($args{variables}->{log_bin}, "ON");
},
},
{
@@ -472,7 +472,7 @@ sub get_rules {
code => sub {
my ( %args ) = @_;
return _var_sneq($args{variables}->{innodb_support_xa}, "ON")
&& $args{variables}->{log_bin} ? 1 : 0;
&& _var_seq($args{variables}->{log_bin}, "ON");
},
},
{
@@ -520,7 +520,7 @@ sub get_rules {
code => sub {
my ( %args ) = @_;
return
$args{variables}->{log_bin}
_var_seq($args{variables}->{log_bin}, "ON")
&& ( _var_eq($args{variables}->{sync_binlog}, 0)
|| _var_gt($args{variables}->{sync_binlog}, 1)) ? 1 : 0;
},

21
t/lib/VariableAdvisorRules.t
View File

@@ -9,7 +9,7 @@ BEGIN {
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More tests => 83;
use Test::More;
use PodParser;
use AdvisorRules;
@@ -279,6 +279,10 @@ my @cases = (
vars => [qw(expire_log_days 0 log_bin ON)],
advice => [qw(expire_log_days)],
},
{ name => "expire_log_days, log_bin OFF, only warns about log_bin",
vars => [qw(expire_log_days 0 log_bin OFF)],
advice => [qw(log_bin)],
},
{ name => "innodb_file_io_threads",
vars => [qw(innodb_file_io_threads 16)],
advice => [qw(innodb_file_io_threads)],
@@ -295,10 +299,18 @@ my @cases = (
vars => [qw(innodb_locks_unsafe_for_binlog ON log_bin ON)],
advice => [qw(innodb_locks_unsafe_for_binlog)],
},
{ name => "innodb_locks_unsafe_for_binlog, log_bin off, only warns about log_bin",
vars => [qw(innodb_locks_unsafe_for_binlog ON log_bin OFF)],
advice => [qw(log_bin)],
},
{ name => "innodb_support_xa",
vars => [qw(innodb_support_xa OFF log_bin ON)],
advice => [qw(innodb_support_xa)],
},
{ name => "innodb_support_xa, log_bin OFF, only warns about log_bin",
vars => [qw(innodb_support_xa OFF log_bin OFF)],
advice => [qw(log_bin)],
},
{ name => "log_bin ON",
vars => [qw(log_bin ON)],
advice => [qw()],
@@ -339,6 +351,10 @@ my @cases = (
vars => [qw(sync_binlog 2 log_bin ON)],
advice => [qw(sync_binlog)],
},
{ name => "log_bin OFF, sync_binlog 0, doesn't warn about sync_binlog",
vars => [qw(sync_binlog 0 log_bin OFF)],
advice => [qw(log_bin)],
},
{ name => "tmp_table_size",
vars => [qw(tmp_table_size 1024 max_heap_table_size 512)],
advice => [qw(tmp_table_size)],
@@ -404,4 +420,5 @@ like(
qr/Complete test coverage/,
'_d() works'
);
exit;
done_testing;