Merge lp:~sergei.glushchenko/percona-xtrabackup/ST-29497-bug1123335-20 into lp:percona-xtrabackup/2.0
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 505 |
Proposed branch: | lp:~sergei.glushchenko/percona-xtrabackup/ST-29497-bug1123335-20 |
Merge into: | lp:percona-xtrabackup/2.0 |
Diff against target: |
42 lines (+26/-1) 2 files modified
innobackupex (+1/-1) test/t/ib_rsync_nolock.sh (+25/-0) |
To merge this branch: | bzr merge lp:~sergei.glushchenko/percona-xtrabackup/ST-29497-bug1123335-20 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+148167@code.launchpad.net |
Description of the change
Bug 1123335
innobackupex fails when --no-lock and --rsync are used in conjunction.
With rsync copy mode copying being done in two stages. During the first
stage files copied without holding a lock. During the second stage we
run rsync once again with tables locked. By doing this we minimize
the time when tables locked (as second rsync pass is shorter then
doing full copy). If If --no-lock is specified, there is no need to
perform two passes and we don't.
The bug is that we only perform second pass (backup_files(0)), and
doesn't tale into account that we don't performed the first one.
Solution is to take into account that with --no-lock option specified
first pass hadn't been performed.
Also adds testcase for --rsync --no-lock combination.
http:// jenkins. percona. com/view/ XtraBackup/ job/percona- xtrabackup- 2.0-param/ 330/