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

Merge fix-change-master-bug-932614

Browse Source
This commit is contained in:
Daniel Nichter
2012-12-11 17:42:45 -07:00
parent 37cbed29d9 371f4a9e15
commit ea7fba8b8f
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bin/pt-slave-restart
View File

@@ -4693,9 +4693,6 @@ sub watch_server {
. $o->get('skip-count')); . $o->get('skip-count'));
my $start = $dbh->prepare($start_sql); my $start = $dbh->prepare($start_sql);
my $stop = $dbh->prepare('STOP SLAVE'); my $stop = $dbh->prepare('STOP SLAVE');
my $chmt = $dbh->prepare(
'CHANGE MASTER TO MASTER_LOG_FILE=?, MASTER_LOG_POS=?');
# ######################################################################## # ########################################################################
# Lookup tables of things to do when a problem is detected. # Lookup tables of things to do when a problem is detected.
@@ -4717,8 +4714,14 @@ sub watch_server {
PTDEBUG && _d('Found relay log corruption'); PTDEBUG && _d('Found relay log corruption');
# Can't do CHANGE MASTER TO with a running slave. # Can't do CHANGE MASTER TO with a running slave.
$stop->execute(); $stop->execute();
$chmt->execute(
@{$stat}{qw(relay_master_log_file exec_master_log_pos)}); # Cannot use ? placeholders for CHANGE MASTER values:
# https://bugs.launchpad.net/percona-toolkit/+bug/932614
my $sql = "CHANGE MASTER TO "
. "MASTER_LOG_FILE='$stat->{relay_master_log_file}', "
. "MASTER_LOG_POS=$stat->{exec_master_log_pos}";
PTDEBUG && _d($sql);
$dbh->do($sql);
}, },
skip => sub { skip => sub {
my ( $stat, $dbh ) = @_; my ( $stat, $dbh ) = @_;
@@ -4940,7 +4943,7 @@ pt-slave-restart - Watch and restart MySQL replication after errors.
=head1 SYNOPSIS =head1 SYNOPSIS
Usage: pt-slave-restart [OPTION...] [DSN] Usage: pt-slave-restart [OPTIONS] [DSN]
pt-slave-restart watches one or more MySQL replication slaves for pt-slave-restart watches one or more MySQL replication slaves for
errors, and tries to restart replication if it stops. errors, and tries to restart replication if it stops.
@@ -4957,9 +4960,6 @@ it is having problems with replication. Don't be too hasty to use it unless you
need to. If you use this tool carelessly, you might miss the chance to really need to. If you use this tool carelessly, you might miss the chance to really
solve the slave server's problems. solve the slave server's problems.
At the time of this release there is a bug that causes an invalid
C<CHANGE MASTER TO> statement to be executed.
The authoritative source for updated information is always the online issue The authoritative source for updated information is always the online issue
tracking system. Issues that affect this tool will be marked as such. You can tracking system. Issues that affect this tool will be marked as such. You can
see a list of such issues at the following URL: see a list of such issues at the following URL:
@@ -4974,12 +4974,9 @@ statements that cause errors. It polls slaves intelligently with an
exponentially varying sleep time. You can specify errors to skip and run the exponentially varying sleep time. You can specify errors to skip and run the
slaves until a certain binlog position. slaves until a certain binlog position.
Note: it has come to my attention that Yahoo! had or has an internal tool Although this tool can help a slave advance past errors, you should not
called fix_repl, described to me by a past Yahoo! employee and mentioned in rely on it to "fix" replication. If slave errors occur frequently or
the first edition of High Performance MySQL. Apparently this tool does the unexpectedly, you should identify and fix the root cause.
same thing. Make no mistake, though: this is not a way to "fix replication."
In fact I would not even encourage its use on a regular basis; I use it only
when I have an error I know I just need to skip past.
=head1 OUTPUT =head1 OUTPUT

15
t/pt-slave-restart/pt-slave-restart.t
View File

@@ -26,23 +26,22 @@ if ( !$master_dbh ) {
elsif ( !$slave_dbh ) { elsif ( !$slave_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave'; plan skip_all => 'Cannot connect to sandbox slave';
} }
else {
plan tests => 15;
}
$sb->create_dbs($master_dbh, ['test']); $master_dbh->do('DROP DATABASE IF EXISTS test');
$master_dbh->do('CREATE DATABASE test');
$master_dbh->do('CREATE TABLE test.t (a INT)'); $master_dbh->do('CREATE TABLE test.t (a INT)');
my $i = 0; $sb->wait_for_slaves;
PerconaTest::wait_for_table($slave_dbh, 'test.t');
# Bust replication # Bust replication
$slave_dbh->do('DROP TABLE test.t'); $slave_dbh->do('DROP TABLE test.t');
$master_dbh->do('INSERT INTO test.t SELECT 1'); $master_dbh->do('INSERT INTO test.t SELECT 1');
wait_until( wait_until(
sub { sub {
! $slave_dbh->selectrow_hashref('show slave status')->{slave_sql_running}; my $row = $slave_dbh->selectrow_hashref('show slave status');
return $row->{last_sql_errno};
} }
); );
my $r = $slave_dbh->selectrow_hashref('show slave status'); my $r = $slave_dbh->selectrow_hashref('show slave status');
like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'It is busted'); like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'It is busted');
@@ -140,4 +139,4 @@ diag(`rm -f /tmp/pt-slave-re*`);
$sb->wipe_clean($master_dbh); $sb->wipe_clean($master_dbh);
$sb->wipe_clean($slave_dbh); $sb->wipe_clean($slave_dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
exit; done_testing;