Merge lp:~hrvojem/percona-xtrabackup/rn-2.3.0-alpha1-2.2 into lp:percona-xtrabackup/2.3

Proposed by Alexey Kopytov on 2014-11-05
Status: Rejected
Rejected by: Alexey Kopytov on 2014-11-06
Proposed branch: lp:~hrvojem/percona-xtrabackup/rn-2.3.0-alpha1-2.2
Merge into: lp:percona-xtrabackup/2.3
Diff against target: 576 lines (+326/-23)
15 files modified
storage/innobase/xtrabackup/doc/source/conf.py (+2/-0)
storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst (+2/-2)
storage/innobase/xtrabackup/doc/source/manual.rst (+4/-0)
storage/innobase/xtrabackup/doc/source/release-notes.rst (+11/-0)
storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst (+1/-1)
storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst (+16/-0)
storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst (+87/-0)
storage/innobase/xtrabackup/innobackupex.pl (+53/-13)
storage/innobase/xtrabackup/src/xtrabackup.cc (+2/-0)
storage/innobase/xtrabackup/test/bootstrap.sh (+6/-6)
storage/innobase/xtrabackup/test/t/bug1372679.sh (+54/-0)
storage/innobase/xtrabackup/test/t/bug1382347.sh (+39/-0)
storage/innobase/xtrabackup/test/t/bug369913.sh (+15/-0)
storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh (+33/-0)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/rn-2.3.0-alpha1-2.2
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Resubmit on 2014-11-06
Review via email: mp+240708@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Hrvoje,

Please rebase this on the current PXB trunk (which is now based on 2.3) and resubmit to exclude unrelated revisions.

review: Resubmit

Unmerged revisions

5042. By Hrvoje Matijakovic on 2014-10-29

-xbcloud documentation, 2.3.0-alpha1 release notes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'storage/innobase/xtrabackup/doc/source/conf.py'
--- storage/innobase/xtrabackup/doc/source/conf.py 2014-09-30 09:43:35 +0000
+++ storage/innobase/xtrabackup/doc/source/conf.py 2014-11-05 11:10:08 +0000
@@ -122,6 +122,8 @@
122122
123.. |MariaDB| replace:: *MariaDB*123.. |MariaDB| replace:: *MariaDB*
124124
125.. |xbcloud| replace:: *xbcloud*
126
125.. |tar4ibd| replace:: :program:`tar4ibd`127.. |tar4ibd| replace:: :program:`tar4ibd`
126128
127.. |tar| replace:: :program:`tar`129.. |tar| replace:: :program:`tar`
128130
=== modified file 'storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst'
--- storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst 2014-09-25 16:10:20 +0000
+++ storage/innobase/xtrabackup/doc/source/installation/apt_repo.rst 2014-11-05 11:10:08 +0000
@@ -37,10 +37,10 @@
3737
38 * 10.04LTS (lucid)38 * 10.04LTS (lucid)
39 * 12.04LTS (precise) 39 * 12.04LTS (precise)
40 * 13.10 (saucy)
41 * 14.04LTS (trusty)40 * 14.04LTS (trusty)
41 * 14.10 (utopic)
4242
43.. _debian_experimental: 43.. _debian_testing:
4444
45Percona `apt` Testing repository45Percona `apt` Testing repository
46=================================46=================================
4747
=== modified file 'storage/innobase/xtrabackup/doc/source/manual.rst'
--- storage/innobase/xtrabackup/doc/source/manual.rst 2013-08-30 09:55:04 +0000
+++ storage/innobase/xtrabackup/doc/source/manual.rst 2014-11-05 11:10:08 +0000
@@ -12,6 +12,7 @@
12 xtrabackup_bin/xtrabackup_binary12 xtrabackup_bin/xtrabackup_binary
13 xbstream/xbstream13 xbstream/xbstream
14 xbcrypt/xbcrypt14 xbcrypt/xbcrypt
15 xbcloud/xbcloud
15 how_xtrabackup_works16 how_xtrabackup_works
1617
17|Percona XtraBackup| is a set of following tools:18|Percona XtraBackup| is a set of following tools:
@@ -28,4 +29,7 @@
28:doc:`xbstream <xbstream/xbstream>`29:doc:`xbstream <xbstream/xbstream>`
29 utility that allows streaming and extracting files to/from the :term:`xbstream` format.30 utility that allows streaming and extracting files to/from the :term:`xbstream` format.
3031
32:doc:`xbcloud <xbcloud/xbcloud>`
33 utility used for downloading and uploading full or part of |xbstream| archive from/to cloud.
34
31It is possible to use the |xtrabackup| binary alone, however, the recommend way is using it through the |innobackupex| wrapper script and let it execute |xtrabackup| for you. It might be helpful to first learn :doc:`how to use innobackupex <innobackupex/innobackupex_script>`, and then learn :doc:`how to use xtrabackup <xtrabackup_bin/xtrabackup_binary>` for having a better low-level understanding or control of the tool if needed.35It is possible to use the |xtrabackup| binary alone, however, the recommend way is using it through the |innobackupex| wrapper script and let it execute |xtrabackup| for you. It might be helpful to first learn :doc:`how to use innobackupex <innobackupex/innobackupex_script>`, and then learn :doc:`how to use xtrabackup <xtrabackup_bin/xtrabackup_binary>` for having a better low-level understanding or control of the tool if needed.
3236
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes.rst 2014-03-26 07:39:36 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes.rst 2014-11-05 11:10:08 +0000
@@ -48,3 +48,14 @@
48 :glob:48 :glob:
4949
50 release-notes/2.2/*50 release-notes/2.2/*
51
52Percona |XtraBackup| 2.3
53=========================
54
55.. toctree::
56 :maxdepth: 1
57 :glob:
58
59 release-notes/2.3/*
60
61
5162
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst 2014-03-28 11:46:09 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.1-alpha1.rst 2014-11-05 11:10:08 +0000
@@ -2,7 +2,7 @@
2 |Percona XtraBackup| 2.2.1-alpha12 |Percona XtraBackup| 2.2.1-alpha1
3=======================================3=======================================
44
5Percona is glad to announce the release of |Percona XtraBackup| 2.2.1-alpha1 on March 28th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.1/>`_. This **ALPHA** release, will be available in :ref:`Debian experimental <debian_experimental>` and :ref:`CentOS testing <yum_testing>` repositories. 5Percona is glad to announce the release of |Percona XtraBackup| 2.2.1-alpha1 on March 28th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.1/>`_. This **ALPHA** release, will be available in :ref:`Debian testing <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories.
66
7This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.8 in the 2.1 series at the time of writing).7This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.8 in the 2.1 series at the time of writing).
88
99
=== modified file 'storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst 2014-05-06 17:08:06 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.2/2.2.2-beta1.rst 2014-11-05 11:10:08 +0000
@@ -2,7 +2,7 @@
2 |Percona XtraBackup| 2.2.2-beta12 |Percona XtraBackup| 2.2.2-beta1
3=======================================3=======================================
44
5Percona is glad to announce the release of |Percona XtraBackup| 2.2.2-beta1 on May 8th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.2/>`_. This **BETA** release will be available in :ref:`Debian experimental <debian_experimental>` and :ref:`CentOS testing <yum_testing>` repositories. 5Percona is glad to announce the release of |Percona XtraBackup| 2.2.2-beta1 on May 8th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/XtraBackup/2.2.2/>`_. This **BETA** release will be available in :ref:`Debian testing <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories.
66
7This is a **BETA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.9 in the 2.1 series at the time of writing).7This is a **BETA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.1.9 in the 2.1 series at the time of writing).
88
99
=== added directory 'storage/innobase/xtrabackup/doc/source/release-notes/2.3'
=== added file 'storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst'
--- storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/doc/source/release-notes/2.3/2.3.0-alpha1.rst 2014-11-05 11:10:08 +0000
@@ -0,0 +1,16 @@
1===================================
2 |Percona XtraBackup| 2.3.0-alpha1
3===================================
4
5Percona is glad to announce the release of |Percona XtraBackup| 2.3.0-alpha1 on October 30th 2014. Downloads are available from our download site `here <http://www.percona.com/downloads/TESTING/XtraBackup/xtrabackup-2.3.0alpha1/>`_. This **ALPHA** release, will be available in :ref:`Debian testing <debian_testing>` and :ref:`CentOS testing <yum_testing>` repositories.
6
7This is an **ALPHA** quality release and it is not intended for production. If you want a high quality, Generally Available release, the current Stable version should be used (currently 2.2.5 in the 2.2 series at the time of writing).
8
9New features
10------------
11
12 |Percona XtraBackup| has implemented new tool, :ref:`xbcloud_binary`, which can be used to upload/download full or part of |xbstream| archive from/to cloud.
13
14.. note::
15
16 In order to sucessfully install Percona Xtrabackup 2.3.0-alpha1 on *CentOS*, ``libev.so.4`` package will need to be installed first. ``libev.so.4`` package can be installed from the `EPEL <https://fedoraproject.org/wiki/EPEL>`_ repositories.
017
=== added directory 'storage/innobase/xtrabackup/doc/source/xbcloud'
=== added file 'storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst'
--- storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/doc/source/xbcloud/xbcloud.rst 2014-11-05 11:10:08 +0000
@@ -0,0 +1,87 @@
1.. _xbcloud_binary:
2
3======================
4 The xbcloud Binary
5======================
6
7.. note::
8
9 This feature implementation is considered **ALPHA** quality.
10
11|xbcloud| is a new tool which is part of the |Percona XtraBackup| 2.3.0-alpha1 release. The purpose of |xbcloud| is to download and upload full or part of |xbstream| archive from/to cloud. Archive uploading will employ multipart upload for Amazon and Large Objects on Swift. Along with |xbstream| archive index file will be uploaded which contains list of files and their parts and offsets of those parts in the |xbstream| archive. This index is needed for downloading only part of archive (one or several tables from backups) on demand.
12
13Usage
14-----
15
16Backup: ::
17
18 innobackupex --stream=xbstream /tmp | xbcloud [options] put <name>
19
20Following example shows how to make a full backup and upload it to Swift: ::
21
22 innobackupex --stream=xbstream --extra-lsndir=/tmp /tmp | \
23 xbcloud put --storage=Swift \
24 --swift-container=test \
25 --swift-user=test:tester \
26 --swift-url=http://192.168.8.80:8080/ \
27 --swift-key=testing \
28 --parallel=10 \
29 full_backup
30
31Restore: ::
32
33 xbcloud [options] get <name> [<list-of-files>] | xbstream -x
34
35Following example shows how to fetch and restore the backup from Swift: ::
36
37 xbcloud get --storage=Swift \
38 --swift-container=test \
39 --swift-user=test:tester \
40 --swift-url=http://192.168.8.80:8080/ \
41 --swift-key=testing \
42 full_backup | xbstream -xv -C /tmp/downloaded_full
43
44 innobackupex --apply-log /tmp/downloaded_full
45 innobackupex --copy-back /tmp/downloaded_full
46
47Limitations
48-----------
49
50Restoring individual tables from full cloud backup isn't possible without downloading the entire backup.
51
52Command-line options
53--------------------
54
55|xbcloud| has following command line options:
56
57.. option:: --storage
58
59 Cloud storage option. Only support for Swift is currently implemented. Default is Swift
60
61.. option:: --swift-url
62
63 URL of Swift cluster
64
65.. option:: --swift-user
66
67 Swift username (X-Auth-User, specific to Swift)
68
69.. option:: --swift-key
70
71 Swift key/password (X-Auth-Key, specific to Swift)
72
73.. option:: --swift-container
74
75 Container to backup into (specific to Swift)
76
77.. option:: --parallel=N
78
79 Maximum number of concurrent upload/download threads. Default is 1.
80
81.. option:: --cacert
82
83 Path to the file with CA certificates
84
85.. option:: --insecure
86
87 Do not verify servers certificate
088
=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl 2014-10-08 16:13:58 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl 2014-11-05 11:10:08 +0000
@@ -77,6 +77,8 @@
77my $have_backup_locks = 0;77my $have_backup_locks = 0;
78my $have_galera_enabled = 0;78my $have_galera_enabled = 0;
79my $have_flush_engine_logs = 0;79my $have_flush_engine_logs = 0;
80my $have_multi_threaded_slave = 0;
81my $have_gtid_slave = 0;
8082
81# command line options83# command line options
82my $option_help = '';84my $option_help = '';
@@ -1904,6 +1906,15 @@
19041906
1905 detect_mysql_capabilities_for_backup(\%mysql);1907 detect_mysql_capabilities_for_backup(\%mysql);
19061908
1909
1910 # Do not allow --slave-info with a multi-threded non-GTID slave,
1911 # see https://bugs.launchpad.net/percona-xtrabackup/+bug/1372679
1912 if ($option_slave_info and $have_multi_threaded_slave
1913 and !$have_gtid_slave) {
1914 die "The --slave-info option requires GTID enabled for a " .
1915 "multi-threaded slave."
1916 }
1917
1907 #1918 #
1908 # if one of the history incrementals is being used, try to grab the1919 # if one of the history incrementals is being used, try to grab the
1909 # innodb_to_lsn from the history table and set the option_incremental_lsn1920 # innodb_to_lsn from the history table and set the option_incremental_lsn
@@ -2138,21 +2149,26 @@
2138}2149}
21392150
2140#2151#
2141# Check if a given directory exists, or fail with an error otherwise2152# Check if a given directory exists, or create one otherwise.
2142#2153#
21432154
2144sub if_directory_exists {2155sub if_directory_exists {
2145 my $empty_dir = shift;2156 my $empty_dir = shift;
2146 my $is_directory_empty_comment = shift;2157 my $is_directory_empty_comment = shift;
2147 if (! -d $empty_dir) {2158 if (! -d $empty_dir) {
2148 die "$is_directory_empty_comment directory '$empty_dir' does not exist!";2159 eval { mkpath($empty_dir) };
2160 if ($@) {
2161 die "Can not create $is_directory_empty_comment directory " .
2162 "'$empty_dir': $@";
2163 }
2149 }2164 }
2150}2165}
21512166
2152#2167#
2153# if_directory_exists_and_empty accepts two arguments:2168# if_directory_exists_and_empty accepts two arguments:
2154# variable with directory name and comment.2169# variable with directory name and comment.
2155# Sub checks that directory exists and is empty2170# Sub checks that directory exists and is empty
2171# or creates one if it doesn't exists.
2156# usage: is_directory_exists_and_empty($directory,"Comment");2172# usage: is_directory_exists_and_empty($directory,"Comment");
2157#2173#
21582174
@@ -2418,7 +2434,7 @@
2418 my $orig_ibdata_dir = get_option_safe('innodb_data_home_dir',2434 my $orig_ibdata_dir = get_option_safe('innodb_data_home_dir',
2419 $orig_datadir);2435 $orig_datadir);
2420 my $orig_innodb_data_file_path = get_option_safe('innodb_data_file_path',2436 my $orig_innodb_data_file_path = get_option_safe('innodb_data_file_path',
2421 '');2437 'ibdata1:10M:autoextend');
2422 my $orig_iblog_dir = get_option_safe('innodb_log_group_home_dir',2438 my $orig_iblog_dir = get_option_safe('innodb_log_group_home_dir',
2423 $orig_datadir);2439 $orig_datadir);
2424 my $orig_undo_dir = get_option_safe('innodb_undo_directory',2440 my $orig_undo_dir = get_option_safe('innodb_undo_directory',
@@ -3583,6 +3599,11 @@
3583 } else {3599 } else {
3584 $run = 'apply-log';3600 $run = 'apply-log';
3585 }3601 }
3602
3603 my $now = current_time();
3604
3605 print STDERR "$now $prefix Starting the $run operation\n\n";
3606
3586 print STDERR "IMPORTANT: Please check that the $run run completes successfully.\n";3607 print STDERR "IMPORTANT: Please check that the $run run completes successfully.\n";
3587 print STDERR " At the end of a successful $run run $innobackup_script\n";3608 print STDERR " At the end of a successful $run run $innobackup_script\n";
3588 print STDERR " prints \"completed OK!\".\n\n";3609 print STDERR " prints \"completed OK!\".\n\n";
@@ -4917,20 +4938,26 @@
4917# Query the server to find out what backup capabilities it supports.4938# Query the server to find out what backup capabilities it supports.
4918#4939#
4919sub detect_mysql_capabilities_for_backup {4940sub detect_mysql_capabilities_for_backup {
4941 my $con = shift;
4942
4920 if ($option_incremental) {4943 if ($option_incremental) {
4921 $have_changed_page_bitmaps =4944 $have_changed_page_bitmaps =
4922 mysql_query($_[0], "SELECT COUNT(*) FROM " .4945 mysql_query($con, "SELECT COUNT(*) FROM " .
4923 "INFORMATION_SCHEMA.PLUGINS " .4946 "INFORMATION_SCHEMA.PLUGINS " .
4924 "WHERE PLUGIN_NAME LIKE 'INNODB_CHANGED_PAGES'");4947 "WHERE PLUGIN_NAME LIKE 'INNODB_CHANGED_PAGES'");
4925 }4948 }
49264949
4927 if (!defined($_[0]->{vars})) {4950 if (!defined($con->{vars})) {
4928 get_mysql_vars($_[0]);4951 get_mysql_vars($con);
4929 }4952 }
49304953
4931 $have_backup_locks = defined($_[0]->{vars}->{have_backup_locks});4954 if (!defined($con->{slave_status})) {
49324955 get_mysql_slave_status($con);
4933 $have_galera_enabled = defined($_[0]->{vars}->{wsrep_on});4956 }
4957
4958 $have_backup_locks = defined($con->{vars}->{have_backup_locks});
4959
4960 $have_galera_enabled = defined($con->{vars}->{wsrep_on});
49344961
4935 if ($option_galera_info && !$have_galera_enabled) {4962 if ($option_galera_info && !$have_galera_enabled) {
4936 my $now = current_time();4963 my $now = current_time();
@@ -4942,7 +4969,7 @@
4942 $option_galera_info = 0;4969 $option_galera_info = 0;
4943 }4970 }
49444971
4945 if ($mysql{vars}->{version}->{Value} =~ m/5\.[123]\.\d/) {4972 if ($con->{vars}->{version}->{Value} =~ m/5\.[123]\.\d/) {
4946 my $now = current_time();4973 my $now = current_time();
49474974
4948 print STDERR "\n$now $prefix Warning: FLUSH ENGINE LOGS " .4975 print STDERR "\n$now $prefix Warning: FLUSH ENGINE LOGS " .
@@ -4954,6 +4981,19 @@
4954 } else {4981 } else {
4955 $have_flush_engine_logs = 1;4982 $have_flush_engine_logs = 1;
4956 }4983 }
4984
4985 if (defined($con->{vars}->{slave_parallel_workers}) and
4986 ($con->{vars}->{slave_parallel_workers}->{Value} > 0)) {
4987 $have_multi_threaded_slave = 1;
4988 }
4989
4990 my $gtid_executed = $con->{slave_status}->{Executed_Gtid_Set};
4991 my $gtid_slave_pos = $con->{vars}->{gtid_slave_pos};
4992
4993 if ((defined($gtid_executed) and $gtid_executed ne '') or
4994 (defined($gtid_slave_pos) and $gtid_slave_pos ne '')) {
4995 $have_gtid_slave = 1;
4996 }
4957}4997}
49584998
4959#4999#
49605000
=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc 2014-10-08 18:33:23 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc 2014-11-05 11:10:08 +0000
@@ -2643,6 +2643,8 @@
2643 srv_undo_tablespaces_init(), because fil_is_user_tablespace_id() *2643 srv_undo_tablespaces_init(), because fil_is_user_tablespace_id() *
2644 relies on srv_undo_tablespaces_open to be properly initialized */2644 relies on srv_undo_tablespaces_open to be properly initialized */
26452645
2646 msg("xtrabackup: Generating a list of tablespaces\n");
2647
2646 err = fil_load_single_table_tablespaces(xb_check_if_open_tablespace);2648 err = fil_load_single_table_tablespaces(xb_check_if_open_tablespace);
2647 if (err != DB_SUCCESS) {2649 if (err != DB_SUCCESS) {
2648 return(err);2650 return(err);
26492651
=== modified file 'storage/innobase/xtrabackup/test/bootstrap.sh'
--- storage/innobase/xtrabackup/test/bootstrap.sh 2014-08-20 08:14:37 +0000
+++ storage/innobase/xtrabackup/test/bootstrap.sh 2014-11-05 11:10:08 +0000
@@ -47,12 +47,12 @@
4747
48 innodb55)48 innodb55)
49 url="http://s3.amazonaws.com/percona.com/downloads/community"49 url="http://s3.amazonaws.com/percona.com/downloads/community"
50 tarball="mysql-5.5.36-linux2.6-$arch.tar.gz"50 tarball="mysql-5.5.40-linux2.6-$arch.tar.gz"
51 ;;51 ;;
5252
53 innodb56)53 innodb56)
54 url="http://s3.amazonaws.com/percona.com/downloads/community"54 url="http://s3.amazonaws.com/percona.com/downloads/community"
55 tarball="mysql-5.6.16-linux-glibc2.5-$arch.tar.gz"55 tarball="mysql-5.6.21-linux-glibc2.5-$arch.tar.gz"
56 ;;56 ;;
5757
58 xtradb51)58 xtradb51)
@@ -62,12 +62,12 @@
6262
63 xtradb55)63 xtradb55)
64 url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"64 url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"
65 tarball="Percona-Server-5.5.38-rel35.2-691.Linux.$arch.tar.gz"65 tarball="Percona-Server-5.5.40-rel36.1-707.Linux.$arch.tar.gz"
66 ;;66 ;;
6767
68 xtradb56)68 xtradb56)
69 url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"69 url="http://s3.amazonaws.com/percona.com/downloads/community/yassl"
70 tarball="Percona-Server-5.6.19-rel67.0-648.Linux.$arch.tar.gz"70 tarball="Percona-Server-5.6.21-rel69.0-675.Linux.$arch.tar.gz"
71 ;;71 ;;
7272
73 mariadb51)73 mariadb51)
@@ -87,12 +87,12 @@
8787
88 mariadb55)88 mariadb55)
89 url="http://s3.amazonaws.com/percona.com/downloads/community"89 url="http://s3.amazonaws.com/percona.com/downloads/community"
90 tarball="mariadb-5.5.32-linux-$arch.tar.gz"90 tarball="mariadb-5.5.40-linux-$arch.tar.gz"
91 ;;91 ;;
9292
93 mariadb100)93 mariadb100)
94 url="http://s3.amazonaws.com/percona.com/downloads/community"94 url="http://s3.amazonaws.com/percona.com/downloads/community"
95 tarball="mariadb-10.0.3-linux-$arch.tar.gz"95 tarball="mariadb-10.0.14-linux-$arch.tar.gz"
96 ;;96 ;;
9797
98 *)98 *)
9999
=== added file 'storage/innobase/xtrabackup/test/t/bug1372679.sh'
--- storage/innobase/xtrabackup/test/t/bug1372679.sh 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1372679.sh 2014-11-05 11:10:08 +0000
@@ -0,0 +1,54 @@
1########################################################################
2# Bug #1372679: innobackupex --slave-info doesn't handle
3# slave_parallel_workers>0
4########################################################################
5
6require_server_version_higher_than 5.6.0
7
8# Test that --slave-info with MTS enabled + GTID disabled fails
9
10MYSQLD_EXTRA_MY_CNF_OPTS="
11slave_parallel_workers=2
12"
13master_id=1
14slave_id=2
15
16start_server_with_id $master_id
17
18start_server_with_id $slave_id
19
20setup_slave $slave_id $master_id
21
22switch_server $slave_id
23
24innobackupex --no-timestamp --slave-info $topdir/backup 2>&1 |
25 grep 'The --slave-info option requires GTID enabled for a multi-threaded slave' ||
26 die "could not find the error message"
27
28if [[ ${PIPESTATUS[0]} == 0 ]]
29then
30 die "innobackupex did not fail as expected"
31fi
32
33stop_server_with_id $master_id
34stop_server_with_id $slave_id
35
36remove_var_dirs
37
38# Test that --slave-info with MTS enabled + GTID enabled works
39
40MYSQLD_EXTRA_MY_CNF_OPTS="
41gtid_mode=on
42log_slave_updates=on
43enforce_gtid_consistency=on
44slave_parallel_workers=2
45"
46
47start_server_with_id $master_id
48start_server_with_id $slave_id
49
50setup_slave $slave_id $master_id
51
52switch_server $slave_id
53
54innobackupex --no-timestamp --slave-info $topdir/backup
055
=== added file 'storage/innobase/xtrabackup/test/t/bug1382347.sh'
--- storage/innobase/xtrabackup/test/t/bug1382347.sh 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1382347.sh 2014-11-05 11:10:08 +0000
@@ -0,0 +1,39 @@
1###########################################################################
2# Bug1382347: innobackupex should create server directories when copy back
3# is performed
4###########################################################################
5
6. inc/common.sh
7
8require_server_version_higher_than 5.6.0
9
10mkdir -p ${TEST_VAR_ROOT}/dir/{undo,data,logs}
11
12MYSQLD_EXTRA_MY_CNF_OPTS="
13innodb_file_per_table=1
14innodb_undo_directory=${TEST_VAR_ROOT}/dir/undo
15innodb_undo_tablespaces=4
16innodb_data_home_dir=${TEST_VAR_ROOT}/dir/data
17innodb_log_group_home_dir=${TEST_VAR_ROOT}/dir/logs
18"
19
20start_server
21load_sakila
22
23checksum1=`checksum_table sakila payment`
24test -n "$checksum1" || die "Failed to checksum table sakila.payment"
25
26innobackupex --no-timestamp $topdir/backup
27
28stop_server
29
30rm -rf $MYSQLD_DATADIR
31rm -rf ${TEST_VAR_ROOT}/dir
32
33innobackupex --apply-log $topdir/backup
34innobackupex --copy-back $topdir/backup
35
36start_server
37
38checksum2=`checksum_table sakila payment`
39test -n "$checksum2" || die "Failed to checksum table sakila.payment"
040
=== added file 'storage/innobase/xtrabackup/test/t/bug369913.sh'
--- storage/innobase/xtrabackup/test/t/bug369913.sh 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug369913.sh 2014-11-05 11:10:08 +0000
@@ -0,0 +1,15 @@
1#############################################################################
2# Bug #369913: Feature Request: more verbose output during initial table scan
3#############################################################################
4
5start_server
6
7innobackupex --no-timestamp $topdir/backup
8
9egrep -q \
10 '[0-9]{6} [0-9]{2}:[0-9]{2}:[0-9]{2} .* Starting the backup operation' \
11 $OUTFILE \
12 || die "Could not find the operation start message"
13
14grep -q "xtrabackup: Generating a list of tablespaces" $OUTFILE \
15 || die "Could not find \"Generating a list of tablespaces\" message"
016
=== added file 'storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh'
--- storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh 1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/innodb_data_home_dir.sh 2014-11-05 11:10:08 +0000
@@ -0,0 +1,33 @@
1##############################################################################
2# Test innodb_data_file_dir support
3##############################################################################
4
5. inc/common.sh
6
7mkdir -p ${TEST_VAR_ROOT}/dir/data
8
9MYSQLD_EXTRA_MY_CNF_OPTS="
10innodb_file_per_table=1
11innodb_data_home_dir=${TEST_VAR_ROOT}/dir/data
12"
13
14start_server
15load_sakila
16
17checksum1=`checksum_table sakila payment`
18test -n "$checksum1" || die "Failed to checksum table sakila.payment"
19
20innobackupex --no-timestamp $topdir/backup
21
22stop_server
23
24rm -rf $MYSQLD_DATADIR/*
25rm -rf ${TEST_VAR_ROOT}/dir/data/*
26
27innobackupex --apply-log $topdir/backup
28innobackupex --copy-back $topdir/backup
29
30start_server
31
32checksum2=`checksum_table sakila payment`
33test -n "$checksum2" || die "Failed to checksum table sakila.payment"

Subscribers

People subscribed via source and target branches