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

merge upstream

Browse Source
This commit is contained in:
baron@percona.com
2012-02-07 22:47:34 -05:00
parent 4d5d4da4b7 a08afff18b
commit 927d63295d
5 changed files with 89 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/pt-table-checksum
+30 -25
View File
@@ -3778,7 +3778,7 @@ sub set_nibble_number {
sub nibble_index {
my ($self) = @_;
return lc($self->{index});
return $self->{index};
}
sub statements {
@@ -5877,35 +5877,39 @@ sub main {
# ########################################################################
# Connect to the master.
# ########################################################################
my $vp = new VersionParser();
my $set_on_connect = sub {
my ($dbh) = @_;
return if $o->get('explain');
my $sql;
# https://bugs.launchpad.net/percona-toolkit/+bug/919352
# The tool shouldn't blindly attempt to change binlog_format;
# instead, it should check if it's already set to STATEMENT.
# This is becase starting with MySQL 5.1.29, changing the format
# requires a SUPER user.
my $sql = 'SELECT @@binlog_format';
PTDEBUG && _d($dbh, $sql);
my ($original_binlog_format) = $dbh->selectrow_array($sql);
PTDEBUG && _d('Original binlog_format:', $original_binlog_format);
if ( $original_binlog_format !~ /STATEMENT/i ) {
$sql = q{/*!50108 SET @@binlog_format := 'STATEMENT'*/};
eval {
PTDEBUG && _d($dbh, $sql);
$dbh->do($sql);
};
if ( $EVAL_ERROR ) {
die "Failed to $sql: $EVAL_ERROR\n"
. "This tool requires binlog_format=STATEMENT, "
. "but the current binlog_format is set to "
."$original_binlog_format and an error occurred while "
. "attempting to change it. If running MySQL 5.1.29 or newer, "
. "setting binlog_format requires the SUPER privilege. "
. "You will need to manually set binlog_format to 'STATEMENT' "
. "before running this tool.\n";
if ( $vp->version_ge($dbh, '5.1.5') ) {
$sql = 'SELECT @@binlog_format';
PTDEBUG && _d($dbh, $sql);
my ($original_binlog_format) = $dbh->selectrow_array($sql);
PTDEBUG && _d('Original binlog_format:', $original_binlog_format);
if ( $original_binlog_format !~ /STATEMENT/i ) {
$sql = q{/*!50108 SET @@binlog_format := 'STATEMENT'*/};
eval {
PTDEBUG && _d($dbh, $sql);
$dbh->do($sql);
};
if ( $EVAL_ERROR ) {
die "Failed to $sql: $EVAL_ERROR\n"
. "This tool requires binlog_format=STATEMENT, "
. "but the current binlog_format is set to "
."$original_binlog_format and an error occurred while "
. "attempting to change it. If running MySQL 5.1.29 or newer, "
. "setting binlog_format requires the SUPER privilege. "
. "You will need to manually set binlog_format to 'STATEMENT' "
. "before running this tool.\n";
}
}
}
@@ -5995,7 +5999,6 @@ sub main {
my $q = new Quoter();
my $tp = new TableParser(Quoter => $q);
my $rc = new RowChecksum(Quoter=> $q, OptionParser => $o);
my $vp = new VersionParser();
my $ms = new MasterSlave(VersionParser => $vp);
my $slaves; # all slaves (that we can find)
@@ -6399,7 +6402,8 @@ sub main {
sth => $sth->{explain_upper_boundary},
vals => [ @{$boundary->{lower}}, $nibble_iter->chunk_size() ],
);
if ( lc($expl->{key} || '') ne $nibble_iter->nibble_index() ) {
if ( lc($expl->{key} || '')
ne lc($nibble_iter->nibble_index() || '') ) {
PTDEBUG && _d('Cannot nibble next chunk, aborting table');
if ( $o->get('quiet') < 2 ) {
my $msg
@@ -6467,7 +6471,8 @@ sub main {
: 0;
# Ensure that MySQL is using the chunk index.
if ( lc($expl->{key} || '') ne $nibble_iter->nibble_index() ) {
if ( lc($expl->{key} || '')
ne lc($nibble_iter->nibble_index() || '') ) {
PTDEBUG && _d('Chunk', $args{nibbleno}, 'of table',
"$tbl->{db}.$tbl->{tbl} not using chunk index, skipping");
return 0; # next boundary
@@ -7266,7 +7271,7 @@ sub have_more_chunks {
# The previous chunk index must match the current chunk index,
# else we don't know what to do.
my $chunk_index = $nibble_iter->nibble_index() || '';
my $chunk_index = lc($nibble_iter->nibble_index() || '');
if (lc($last_chunk->{chunk_index} || '') ne $chunk_index) {
warn ts("Cannot resume from table $tbl->{db}.$tbl->{tbl} chunk "
. "$last_chunk->{chunk} because the chunk indexes are different: "
lib/NibbleIterator.pm
+1 -1
View File
@@ -347,7 +347,7 @@ sub set_nibble_number {
sub nibble_index {
my ($self) = @_;
return lc($self->{index});
return $self->{index};
}
sub statements {
t/pt-table-checksum/samples/no-recheck.txt
+4 -4
View File
@@ -1,10 +1,10 @@
Differences on h=127.0.0.1,P=12346
TABLE CHUNK CNT_DIFF CRC_DIFF CHUNK_INDEX LOWER_BOUNDARY UPPER_BOUNDARY
sakila.city 1 0 1 primary 1 100
sakila.city 6 0 1 primary 501 600
sakila.city 1 0 1 PRIMARY 1 100
sakila.city 6 0 1 PRIMARY 501 600
Differences on h=127.0.0.1,P=12347
TABLE CHUNK CNT_DIFF CRC_DIFF CHUNK_INDEX LOWER_BOUNDARY UPPER_BOUNDARY
sakila.city 1 0 1 primary 1 100
sakila.city 6 0 1 primary 501 600
sakila.city 1 0 1 PRIMARY 1 100
sakila.city 6 0 1 PRIMARY 501 600
t/pt-table-sync/basics.t
+36 -1
View File
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave';
}
else {
plan tests => 19;
plan tests => 21;
}
$sb->wipe_clean($master_dbh);
@@ -198,6 +198,41 @@ is(
"Synced diff (bug 911996)"
);
# Fix bug 927771.
$sb->load_file('master', 't/pt-table-sync/samples/bug_927771.sql');
PerconaTest::wait_for_table($slave_dbh, "test.t", "c='j'");
$slave_dbh->do("update test.t set c='z' where id>8");
`$trunk/bin/pt-table-checksum h=127.1,P=12345,u=msandbox,p=msandbox --max-load '' --lock-wait 3 --chunk-size 2 -t test.t --quiet`;
PerconaTest::wait_for_table($slave_dbh, "percona.checksums", "db='test' and tbl='t' and chunk=4");
$output = output(
sub {
pt_table_sync::main('h=127.1,P=12345,u=msandbox,p=msandbox',
qw(--print --execute --replicate percona.checksums),
qw(--no-foreign-key-checks))
},
stderr => 1,
);
like(
$output,
qr/REPLACE INTO `test`.`t`\(`id`, `c`\) VALUES \('9', 'i'\)/,
"--replicate with uc index (bug 927771)"
);
my $rows = $slave_dbh->selectall_arrayref("select id, c from test.t where id>8 order by id");
is_deeply(
$rows,
[
[9, 'i'],
[10, 'j'],
],
"Synced slaved (bug 927771)"
);
# #############################################################################
# Done.
# #############################################################################
t/pt-table-sync/samples/bug_927771.sql
+18
View File
@@ -0,0 +1,18 @@
drop database if exists test;
create database test;
use test;
create table t (
id int auto_increment not null primary key,
c varchar(8) not null
) engine=innodb;
insert into test.t values
(null, 'a'),
(null, 'b'),
(null, 'c'),
(null, 'd'),
(null, 'e'),
(null, 'f'),
(null, 'g'),
(null, 'h'),
(null, 'i'),
(null, 'j');