Merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1363234 into lp:percona-xtrabackup/2.1

Proposed by Sergei Glushchenko on 2014-12-08
Status: Merged
Approved by: Alexey Kopytov on 2014-12-10
Approved revision: 769
Merged at revision: 769
Proposed branch: lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1363234
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 46 lines (+30/-1)
2 files modified
innobackupex.pl (+1/-1)
test/t/bug1363234.sh (+29/-0)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1363234
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-12-08 Approve on 2014-12-10
Review via email: mp+243955@code.launchpad.net

Description of the change

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.1-param-new/21/

Don't remove undo tablespaces during incremental prepare.

To post a comment you must log in.
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.pl'
--- innobackupex.pl 2014-11-21 08:35:11 +0000
+++ innobackupex.pl 2014-12-08 09:22:46 +0000
@@ -2605,7 +2605,7 @@
2605 push(@skip_list, "\Q$c->{filename}\E");2605 push(@skip_list, "\Q$c->{filename}\E");
2606 }2606 }
2607 cleanup_dir_recursively($backup_dir,2607 cleanup_dir_recursively($backup_dir,
2608 '^(' . join('|', @skip_list, '.*\.ibd') . ')$');2608 '^(' . join('|', @skip_list, '.*\.ibd', 'undo[0-9]+') . ')$');
2609 }2609 }
26102610
2611}2611}
26122612
=== added file 'test/t/bug1363234.sh'
--- test/t/bug1363234.sh 1970-01-01 00:00:00 +0000
+++ test/t/bug1363234.sh 2014-12-08 09:22:46 +0000
@@ -0,0 +1,29 @@
1########################################################################
2# Bug 1363234: Incremental backup fail with innodb_undo_tablespaces > 1
3########################################################################
4
5. inc/common.sh
6
7require_server_version_higher_than 5.6.0
8
9MYSQLD_EXTRA_MY_CNF_OPTS="
10innodb_file_per_table=1
11innodb_undo_tablespaces=4
12"
13
14start_server
15load_sakila
16
17# backup
18innobackupex --no-timestamp $topdir/backup
19innobackupex --incremental --no-timestamp \
20 --incremental-basedir=$topdir/backup $topdir/inc1
21innobackupex --incremental --no-timestamp \
22 --incremental-basedir=$topdir/inc1 $topdir/inc2
23
24# prepare (last one would fail)
25innobackupex --apply-log --redo-only $topdir/backup
26innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc1 \
27 $topdir/backup
28innobackupex --apply-log --redo-only --incremental-dir=$topdir/inc2 \
29 $topdir/backup

Subscribers

People subscribed via source and target branches