percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-14 01:00:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

merged pt-table-checksum-max-load-20-percent-rounds-down

Browse Source
This commit is contained in:
Frank Cizmich
2014-08-05 16:47:44 -03:00
parent f23a264e76 b5a31ecbaa
commit 780cfb33cc
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/pt-online-schema-change
View File

@@ -4785,6 +4785,7 @@ package MySQLStatusWaiter;
use strict;
use warnings FATAL => 'all';
use POSIX qw( ceil );
use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0;
@@ -4950,8 +4951,8 @@ sub _check_and_set_vals {
}
else {
PTDEBUG && _d('Initial', $var, 'value:', $init_val);
$val = int(($init_val * $threshold_factor) + $init_val);
$vars->{$var} = $val;
$val = ($init_val * $threshold_factor) + $init_val;
$vars->{$var} = int(ceil($val));
}
PTDEBUG && _d('Wait if', $var, '>=', $val);
}

5
bin/pt-table-checksum
View File

@@ -8347,6 +8347,7 @@ package MySQLStatusWaiter;
use strict;
use warnings FATAL => 'all';
use POSIX qw( ceil );
use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0;
@@ -8512,8 +8513,8 @@ sub _check_and_set_vals {
}
else {
PTDEBUG && _d('Initial', $var, 'value:', $init_val);
$val = int(($init_val * $threshold_factor) + $init_val);
$vars->{$var} = $val;
$val = ($init_val * $threshold_factor) + $init_val;
$vars->{$var} = int(ceil($val));
}
PTDEBUG && _d('Wait if', $var, '>=', $val);
}

5
lib/MySQLStatusWaiter.pm
View File

@@ -24,6 +24,7 @@ package MySQLStatusWaiter;
use strict;
use warnings FATAL => 'all';
use POSIX qw( ceil );
use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0;
@@ -221,8 +222,8 @@ sub _check_and_set_vals {
}
else {
PTDEBUG && _d('Initial', $var, 'value:', $init_val);
$val = int(($init_val * $threshold_factor) + $init_val);
$vars->{$var} = $val;
$val = ($init_val * $threshold_factor) + $init_val;
$vars->{$var} = int(ceil($val));
}
PTDEBUG && _d('Wait if', $var, '>=', $val);
}

28
t/lib/MySQLStatusWaiter.t
View File

@@ -8,6 +8,7 @@ BEGIN {
use strict;
use warnings FATAL => 'all';
use POSIX qw( ceil floor );
use English qw(-no_match_vars);
use Test::More tests => 17;
@@ -19,6 +20,7 @@ my @checked = ();
my $slept = 0;
my @vals = ();
sub oktorun {
return $oktorun;
}
@@ -76,33 +78,35 @@ throws_ok(
"Catch non-existent variable"
);
# ############################################################################
# Use initial vals + 20%.
# Initial vals + 20%
# ############################################################################
@vals = (
# initial check for existence
{ Threads_connected => 10, },
{ Threads_running => 5, },
{ Threads_connected => 9, },
{ Threads_running => 4, },
# first check, no wait
{ Threads_connected => 1, },
{ Threads_running => 1, },
# second check, wait
{ Threads_connected => 12, }, # too high
{ Threads_running => 6, }, # too high
{ Threads_connected => 11, }, # too high
{ Threads_running => 5, }, # too high
# third check, wait
{ Threads_connected => 12, }, # too high
{ Threads_running => 5, },
{ Threads_connected => 11, }, # too high
{ Threads_running => 4, },
# fourth check, wait
{ Threads_connected => 10, },
{ Threads_running => 6, }, # too high
{ Threads_running => 5, }, # too high
# fifth check, no wait
{ Threads_connected => 10, },
{ Threads_running => 5, },
{ Threads_running => 4, },
);
$oktorun = 1;
@@ -117,10 +121,10 @@ my $sw = new MySQLStatusWaiter(
is_deeply(
$sw->max_values(),
{
Threads_connected => int(10 + (10 * 0.20)),
Threads_running => int(5 + (5 * 0.20)),
Threads_connected => ceil(9 + (9 * 0.20)),
Threads_running => ceil(4 + (4 * 0.20)),
},
"Initial values +20%"
"Threshold = ceil(InitialValue * 1.2)"
);
# first check

1
t/pt-table-checksum/basics.t
View File

@@ -97,6 +97,7 @@ ok(
"Static chunk size (--chunk-time 0)"
);
$row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums");
ok(
$row->[0] >= 85 && $row->[0] <= 90,