Merge lp://qastaging/~gl-az/percona-xtrabackup/BT23557-2.1-lp1160788 into lp://qastaging/percona-xtrabackup/2.1
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alexey Kopytov | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 650 | ||||
Proposed branch: | lp://qastaging/~gl-az/percona-xtrabackup/BT23557-2.1-lp1160788 | ||||
Merge into: | lp://qastaging/percona-xtrabackup/2.1 | ||||
Diff against target: |
712 lines (+327/-78) (has conflicts) 12 files modified
innobackupex (+294/-38) test/inc/ib_stream_common.sh (+9/-3) test/inc/xb_local.sh (+7/-3) test/t/ib_compress_basic.sh (+1/-2) test/t/ib_stream_compress.sh (+1/-2) test/t/ib_stream_compress_encrypt.sh (+1/-2) test/t/xb_compress.sh (+1/-2) test/t/xb_compress_encrypt.sh (+2/-9) test/t/xb_encrypt.sh (+8/-0) test/t/xb_parallel_compress.sh (+1/-2) test/t/xb_parallel_compress_encrypt.sh (+1/-9) test/t/xb_parallel_encrypt.sh (+1/-6) Text conflict in innobackupex Text conflict in test/t/xb_encrypt.sh |
||||
To merge this branch: | bzr merge lp://qastaging/~gl-az/percona-xtrabackup/BT23557-2.1-lp1160788 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Approve | ||
Vlad Lesin | g2 | Pending | |
Review via email: mp+177057@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2013-07-12.
Description of the change
Added --decompress and --decrypt options both with functioning --parallel to innobackupex based on lp1160788. These options options will decrypt and/or decompress a backup made with the --compress and/or --encrypt options.
When decrypting, the encryption algorithm and key used when the backup was taken MUST be provided via the --decrypt=ALGORITHM and --encrypt-
For decompression to work, the qpress binary must be present within the path.
--decrypt and --decompress may be used together at the same time to completely normalize a previously compressed and encrypted backup but in some rare instances there may be io buffer overflow issues which would require calling innobackupex twice instead of a combined single call (once for decryption and once for decompression).
The --parallel option will allow multiple files to be decrypted and/or decompressed simultaneously.
Use of these options will remove the original compressed/
test suite cases have been modified to make use of these new options where appropriate:
test/
test/
test/
test/
test/
test/
test/
test/
test/
-----
Rebased on trunk and fixed previous MP issue.
jenkins http://
-----
Rebased on trunk again and fixed more review issues.
jenkins http://
23557
jenkins jenkins. percona. com/view/ XtraBackup/ job/percona- xtrabackup- 2.1-param/ 325/
http://