Merge lp:~percona-toolkit-dev/percona-toolkit/fix-pt-va-5.6-dirty-pages-bug-1168106 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-variable-advisor'
--- bin/pt-variable-advisor	2013-06-27 20:54:10 +0000
+++ bin/pt-variable-advisor	2013-06-27 21:50:37 +0000
@@ -3376,7 +3376,9 @@
       id   => 'innodb_max_dirty_pages_pct',
       code => sub {
          my ( %args ) = @_;
-         return _var_lt($args{variables}->{innodb_max_dirty_pages_pct}, 90);
+         my $mysql_version = $args{mysql_version};
+         return _var_lt($args{variables}->{innodb_max_dirty_pages_pct},
+            ($mysql_version < '5.5' ? 90 : 75));
       },
    },
    {

=== modified file 'lib/VariableAdvisorRules.pm'
--- lib/VariableAdvisorRules.pm	2013-01-03 00:19:16 +0000
+++ lib/VariableAdvisorRules.pm	2013-06-27 21:50:37 +0000
@@ -214,7 +214,9 @@
       id   => 'innodb_max_dirty_pages_pct',
       code => sub {
          my ( %args ) = @_;
-         return _var_lt($args{variables}->{innodb_max_dirty_pages_pct}, 90);
+         my $mysql_version = $args{mysql_version};
+         return _var_lt($args{variables}->{innodb_max_dirty_pages_pct},
+            ($mysql_version < '5.5' ? 90 : 75));
       },
    },
    {

=== added file 't/pt-variable-advisor/advice.t'
--- t/pt-variable-advisor/advice.t	1970-01-01 00:00:00 +0000
+++ t/pt-variable-advisor/advice.t	2013-06-27 21:50:37 +0000
@@ -0,0 +1,50 @@
+#!/usr/bin/env perl
+
+BEGIN {
+   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Test::More;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-variable-advisor";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('master');
+my $dsn = $sb->dsn_for('master');
+
+if ( !$dbh ) {
+   plan skip_all => "Cannot connect to sandbox master";
+}
+
+# #############################################################################
+# https://bugs.launchpad.net/percona-toolkit/+bug/1168106
+# pt-variable-advisor has the wrong default value for
+# innodb_max_dirty_pages_pct in 5.6.10
+# #############################################################################
+
+my @args   = "$dsn";
+my $output = "";
+
+$output = output(
+   sub { pt_variable_advisor::main(@args) },
+);
+
+unlike(
+   $output,
+   qr/innodb_max_dirty_pages_pct/,
+   "No innodb_max_dirty_pages_pct warning (bug 1168106)"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;