Merge lp:~sergei.glushchenko/percona-xtrabackup/xb20-bug1095551 into lp:percona-xtrabackup/2.0

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 496
Proposed branch: lp:~sergei.glushchenko/percona-xtrabackup/xb20-bug1095551
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 20 lines (+2/-1)
1 file modified
innobackupex (+2/-1)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-xtrabackup/xb20-bug1095551
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+141853@code.launchpad.net

Description of the change

Bug 1095551
Unnecessary long sleep() in innobackupex leads to FTWRL taking too long.
2 seconds sleep interval in mysql_ping been replaced by 100 milliseconds sleep interval.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/318/

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'innobackupex'
--- innobackupex 2013-01-02 04:20:08 +0000
+++ innobackupex 2013-01-04 05:17:24 +0000
@@ -18,6 +18,7 @@
18use File::Find;18use File::Find;
19use File::Copy;19use File::Copy;
20use English qw(-no_match_vars);20use English qw(-no_match_vars);
21use Time::HiRes qw(usleep);
2122
22# version of this script23# version of this script
23my $innobackup_version = '1.5.1-xtrabackup';24my $innobackup_version = '1.5.1-xtrabackup';
@@ -912,7 +913,7 @@
912 print STDERR "$prefix Waiting for ibbackup (pid=$ibbackup_pid) to suspend\n";913 print STDERR "$prefix Waiting for ibbackup (pid=$ibbackup_pid) to suspend\n";
913 print STDERR "$prefix Suspend file '$suspend_file'\n\n";914 print STDERR "$prefix Suspend file '$suspend_file'\n\n";
914 for (;;) {915 for (;;) {
915 sleep 2;916 usleep(100000);
916 last if -e $suspend_file;917 last if -e $suspend_file;
917918
918 # check that ibbackup child process is still alive919 # check that ibbackup child process is still alive

Subscribers

People subscribed via source and target branches