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

Add another test for reconnect, and fix failure/race condition in pt-slave-delay

Browse Source
This commit is contained in:
Baron Schwartz
2012-06-04 11:33:06 -04:00
parent 9aaafe8478
commit 56e20d269a
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/pt-slave-delay
+9 -10
View File
@@ -2117,8 +2117,7 @@ sub main {
$now = time(); $now = time();
# TODO: this is a race condition. See 0xdeadbeef below. # If the database connection is gone, we must live on!
if ( !$slave_dbh || !$slave_dbh->ping() ) {
# Try 10 times, for about 2 minutes, to reconnect to the slave, # Try 10 times, for about 2 minutes, to reconnect to the slave,
# increasing wait time from 3 to 15 seconds. # increasing wait time from 3 to 15 seconds.
$o->set('ask-pass', 0); # don't ask again $o->set('ask-pass', 0); # don't ask again
@@ -2131,16 +2130,19 @@ sub main {
my ( %args ) = @_; my ( %args ) = @_;
return unless $oktorun; return unless $oktorun;
my $t = min($args{tryno} * 3, 15); my $t = min($args{tryno} * 3, 15);
info("Could not reconnect to slave, sleeping $t seconds " info("Lost connection, sleeping $t seconds "
. "and trying " . ($tries-$args{tryno}) . " more times") . "and trying " . ($tries-$args{tryno}) . " more times")
if $tries - $args{tryno}; if $tries - $args{tryno};
sleep $t; sleep $t;
info("Trying to reconnect");
eval {
$slave_dbh = get_dbh($dp, $slave_dsn);
};
}, },
try => sub { try => sub {
return unless $oktorun; return unless $oktorun;
info("Lost connection to slave, trying to reconnect"); $status = $slave_dbh->selectrow_hashref("SHOW SLAVE STATUS");
$slave_dbh = get_dbh($dp, $slave_dsn); return $status;
return $slave_dbh;
}, },
on_success => sub { on_success => sub {
info("Reconnected to slave"); info("Reconnected to slave");
@@ -2151,10 +2153,7 @@ sub main {
}, },
); );
last unless $oktorun; # might have gotten interrupt while waiting last unless $oktorun; # might have gotten interrupt while waiting
}
# 0xdeadbeef (see above): just because we reconnected in the above Retry
# does not mean we have a connection here!
$status = $slave_dbh->selectrow_hashref("SHOW SLAVE STATUS");
if ( !$status || ! %$status ) { if ( !$status || ! %$status ) {
die "No SLAVE STATUS found"; die "No SLAVE STATUS found";
} }
t/pt-slave-delay/auto_restart.t
+4 -3
View File
@@ -45,10 +45,11 @@ my $output;
# the child should restart the slave, and the tool should report # the child should restart the slave, and the tool should report
# that it reconnected and did some work, ending with "Setting slave # that it reconnected and did some work, ending with "Setting slave
# to run normally". # to run normally".
diag('Running...');
my $pid = fork(); my $pid = fork();
if ( $pid ) { if ( $pid ) {
# parent # parent
$output = `$cmd --interval 1 --run-time 8 2>&1`; $output = `$cmd --interval 1 --run-time 4 2>&1`;
like( like(
$output, $output,
qr/Lost connection.+?Reconnected to slave.+Setting slave to run/ms, qr/Lost connection.+?Reconnected to slave.+Setting slave to run/ms,
@@ -71,11 +72,11 @@ waitpid ($pid, 0);
$pid = fork(); $pid = fork();
if ( $pid ) { if ( $pid ) {
# parent. Note the --database mysql # parent. Note the --database mysql
$output = `$cmd --database mysql --interval 1 --run-time 8 2>&1`; $output = `$cmd --database mysql --interval 1 --run-time 4 2>&1`;
like( like(
$output, $output,
qr/Lost connection.+?Reconnected to slave.+Setting slave to run/ms, qr/Lost connection.+?Reconnected to slave.+Setting slave to run/ms,
"Reconnect to slave" "Reconnect to slave when KILL'ed"
); );
} }
else { else {