From 181da2a9adc6f2da52f9319bd134462f1a9acaf9 Mon Sep 17 00:00:00 2001 From: Marcelo Altmann Date: Thu, 23 Nov 2023 13:07:45 -0300 Subject: [PATCH 01/10] Fixed PXB-3168 - Under high write load, backup fails with "log block numbers mismatch" error https://jira.percona.com/browse/PXB-3168 TL;DR - During the implementation of new redo log design parser at 8.0.30, PXB missed a condition that the logs can be reused and blocks read in buffer can be an old block. Redo Log Design: The new design of redo logs at 8.0.30, uses an ever incremental post-fix ID in the redo log file number. The server can have up to 32 active redo log files. Once a file is recycled, it gets renamed to the new corresponding ID (its current number + 32 _tmp). When made active again by the server, it gets renamed to remove the _tmp from its name. This means the logs can have data from before the recycle. PXB redo log copying works in three parts: 1. Read a chunk of 64K (4* page size) into read buffer at `read_log_seg` 2. Based on the last known LSN, parse the new data blocks and check if the block nr in the block is exactly 1 block ahead of the last block number. Keep doing this until it finds a block that mismatches. This is done at `scan_log_recs`. 3. Write the blocks up to the position found at step 2 into `xtrabackup_logfile` There are two conditions to stop parsing the buffer and identify whether we are reading the tail of the log recycled log. This happens when we are catch up with the server (reading the most up to date block written by the server): ** Condition 1 - The next block is lower than what we expected: For simplicity, we will demonstrate 2 logs instead of 32. Once log 2 is full, We will re-use log1 (renamed to log3) and write up to slot 4. H - head of the log - last position written by the server T - tail of the log - garbage from the log when it was named log1 ``` slots | S1 | S2 | S3 | S4 | S5 | S6 | S7 | S8 | S9 | log 1 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | log 2 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | log 3 | 19 | 20 | 21 | 22 | 5 | 6 | 7 | 8 | 9 | | | | | H | T | | | | | ``` Here we will read the block and identify that block nr 5 is lower than expected and will consider the parsing as finished at block 22. ** Condition 2 - The next block is higher than what we expected: Blocks wrap around at number 1073741824 (1G), meaning they will restart from 1 when we reach a LSN that is 512G (1G block, each block is 512 bytes - OS_FILE_LOG_BLOCK_SIZE). For simplicity, let's get the same 9 slots log as above and 2 logs in total and wrap around after block 7 ``` slots | S1 | S2 | S3 | S4 | S5 | S6 | S7 | S8 | S9 | log 1 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 1 | 2 | log 2 | 3 | 4 | 5 | 6 | 7 | 1 | 2 | 3 | 4 | log 3 | 5 | 6 | 7 | 1 | 5 | 6 | 7 | 1 | 2 | | | | | H | T | | | | | ``` Wrap around is identified with the below formula: * continuos_block_capacity_in_redo - the number of 512-bytes block capacity we have before we start to overwrite data. * wrap_around_block_capacity - When our blocks wrap around. expected_hdr_nr - last successful read block + 1. read_block_number - block number read from block header. Formula: ``` ((expected_hdr_nr | (continuos_block_capacity_in_redo - 1)) - read_block_number) % wrap_around_block_capacity == 0 ``` On the above example when we read the 5 coming from the tail of previous log data, we have: * continuos_block_capacity_in_redo - We have 9 slots per redo and 2 redo, resulting in a continuous of 18 blocks, minus 1 resulting in 17 blocks. * wrap_around_block_capacity - In the above example we wrap at block 7. In the server is at 1G * expected_hdr_nr - 2 * read_block_number - 5 Resulting in: ``` (gdb) p ((2 | (18-1)) - 5) % 7 == 0 $1 = true ``` This means the block number 5 comes from the tail of previous data in the recycled log. The Problem: Xtrabackup was missing the second condition, and only considered old block from the log buffer in case the `read_block_number` was lower than the `expected_hdr_nr`. Fix: We are using the upstream approach of considering the block as garbage if it differs from what we expect, with the addition of also validating if the checksum is correct. --- storage/innobase/xtrabackup/src/redo_log.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/storage/innobase/xtrabackup/src/redo_log.cc b/storage/innobase/xtrabackup/src/redo_log.cc index 371798b16621..2b17e8d63d0a 100644 --- a/storage/innobase/xtrabackup/src/redo_log.cc +++ b/storage/innobase/xtrabackup/src/redo_log.cc @@ -501,17 +501,8 @@ ssize_t Redo_Log_Reader::scan_log_recs_8030(byte *buf, bool is_last, if (block_header.m_hdr_no != expected_hdr_no && checksum_is_ok) { /* old log block, do nothing */ - if (block_header.m_hdr_no < expected_hdr_no) { - *finished = true; - break; - } - xb::error() << "log block numbers mismatch:"; - xb::error() << "expected log block no. " << expected_hdr_no - << ", but got no. " << block_header.m_hdr_no - << " from the log file."; - - return (-1); - + *finished = true; + break; } else if (!checksum_is_ok) { /* Garbage or an incompletely written log block */ xb::warn() << "Log block checksum mismatch (block no " From c06757ca34d6d9d86c8cf2a836e3c916c39cfab2 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Tue, 5 Dec 2023 19:42:16 +0200 Subject: [PATCH 02/10] RM-1274 PXB-8.2 --- .../xtrabackup/utils/percona-xtrabackup-8.0_builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index fae8da248e6d..89189f27f031 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -325,8 +325,8 @@ install_deps() { else PKGLIST+=" libproc2-dev" fi - if [ "${OS_NAME}" == "bionic" ]; then - PKGLIST+=" gcc-8 g++-8" + if [ "${OS_NAME}" == "focal" ]; then + PKGLIST+=" gcc-10 g++-10" fi if [ "${OS_NAME}" == "focal" -o "${OS_NAME}" == "bullseye" -o "${OS_NAME}" == "bookworm" -o "${OS_NAME}" == "jammy" ]; then PKGLIST+=" python3-sphinx python3-docutils" From b1454a6974bbef777ed96b6074bfe423993188be Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Tue, 5 Dec 2023 20:06:15 +0200 Subject: [PATCH 03/10] RM-1274 PXB-8.2 --- .../xtrabackup/utils/percona-xtrabackup-8.0_builder.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 89189f27f031..1df285205633 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -339,6 +339,13 @@ install_deps() { echo "waiting" done + if [ "${OS_NAME}" == "focal" ]; then + gcc --version + update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 + update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 + gcc --version + fi + fi return; } From ac43fea34b7bbc77288be6c32bd96c0d164833f0 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Tue, 5 Dec 2023 21:33:10 +0200 Subject: [PATCH 04/10] RM-1274 PXB-8.2 --- .../innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 1df285205633..2a21442b221a 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -272,6 +272,7 @@ install_deps() { sleep 1 done yum -y remove centos-release-stream + source /opt/rh/gcc-toolset-10/enable fi else until yum -y install epel-release centos-release-scl; do From 432811186480d5cd8122f436c27ef7e155ec5eaa Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Thu, 7 Dec 2023 09:39:35 +0200 Subject: [PATCH 05/10] RM-1274 PXB-8.2 --- .../utils/percona-xtrabackup-8.0_builder.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 2a21442b221a..68301294aa1a 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -263,16 +263,15 @@ install_deps() { sleep 1 done if [ $RHEL = 8 ]; then - DEVTOOLSET10_PKGLIST+=" gcc-toolset-10-gcc-c++ gcc-toolset-10-binutils" - DEVTOOLSET10_PKGLIST+=" gcc-toolset-10-valgrind gcc-toolset-10-valgrind-devel gcc-toolset-10-libatomic-devel" - DEVTOOLSET10_PKGLIST+=" gcc-toolset-10-libasan-devel gcc-toolset-10-libubsan-devel gcc-toolset-10-annobin" - yum -y install centos-release-stream - until yum -y install ${DEVTOOLSET10_PKGLIST}; do + DEVTOOLSET12_PKGLIST+=" gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils" + DEVTOOLSET12_PKGLIST+=" gcc-toolset-12-libatomic-devel" + DEVTOOLSET12_PKGLIST+=" gcc-toolset-12-libasan-devel gcc-toolset-12-libubsan-devel" + until yum -y install ${DEVTOOLSET12_PKGLIST}; do echo "waiting" sleep 1 done - yum -y remove centos-release-stream - source /opt/rh/gcc-toolset-10/enable + source /opt/rh/gcc-toolset-12/enable + gcc --version fi else until yum -y install epel-release centos-release-scl; do From 045b4d5b52a03c61b2039639f47931303c9603ed Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Thu, 7 Dec 2023 12:15:49 +0200 Subject: [PATCH 06/10] RM-1274 PXB-8.2 --- .../xtrabackup/utils/percona-xtrabackup-8.0_builder.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 68301294aa1a..367b8b104ba3 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -246,11 +246,11 @@ install_deps() { percona-release enable tools testing if [ ${RHEL} = 8 -o ${RHEL} = 9 ]; then PKGLIST+=" binutils-devel python3-pip python3-setuptools" - PKGLIST+=" libcurl-devel cmake libaio-devel zlib-devel libev-devel bison make gcc" - PKGLIST+=" rpm-build libgcrypt-devel ncurses-devel readline-devel openssl-devel gcc-c++" + PKGLIST+=" libcurl-devel cmake libaio-devel zlib-devel libev-devel bison make" + PKGLIST+=" rpm-build libgcrypt-devel ncurses-devel readline-devel openssl-devel" PKGLIST+=" vim-common rpmlint patchelf python3-wheel libudev-devel" if [ $RHEL = 9 ]; then - PKGLIST+=" rsync procps-ng-devel python3-sphinx" + PKGLIST+=" rsync procps-ng-devel python3-sphinx gcc gcc-c++" else yum-config-manager --enable powertools wget https://jenkins.percona.com/downloads/rpm/procps-ng-devel-3.3.15-6.el8.x86_64.rpm From 2ec40a676e663728897630cb9299c027435d9948 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Thu, 7 Dec 2023 12:29:48 +0200 Subject: [PATCH 07/10] RM-1274 PXB-8.2 --- .../xtrabackup/utils/percona-xtrabackup-8.0_builder.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 367b8b104ba3..18ac09f216fc 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -270,7 +270,8 @@ install_deps() { echo "waiting" sleep 1 done - source /opt/rh/gcc-toolset-12/enable + update-alternatives --install /usr/bin/gcc gcc /opt/rh/gcc-toolset-12/root/usr/bin/gcc 10 + update-alternatives --install /usr/bin/g++ g++ /opt/rh/gcc-toolset-12/root/usr/bin/g++ 10 gcc --version fi else From e43f1c19ecc80a6b978591eb33c1c348fc5633f4 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Thu, 7 Dec 2023 15:15:45 +0200 Subject: [PATCH 08/10] RM-1274 PXB-8.2 --- .../utils/percona-xtrabackup-8.0_builder.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 18ac09f216fc..b485761fff63 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -263,15 +263,15 @@ install_deps() { sleep 1 done if [ $RHEL = 8 ]; then - DEVTOOLSET12_PKGLIST+=" gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils" - DEVTOOLSET12_PKGLIST+=" gcc-toolset-12-libatomic-devel" - DEVTOOLSET12_PKGLIST+=" gcc-toolset-12-libasan-devel gcc-toolset-12-libubsan-devel" - until yum -y install ${DEVTOOLSET12_PKGLIST}; do + DEVTOOLSET10_PKGLIST+=" gcc-toolset-10-gcc-c++ gcc-toolset-10-binutils" + DEVTOOLSET10_PKGLIST+=" gcc-toolset-10-libatomic-devel gcc-toolset-10-valgrind gcc-toolset-10-valgrind-devel" + DEVTOOLSET10_PKGLIST+=" gcc-toolset-10-libasan-devel gcc-toolset-10-libubsan-devel gcc-toolset-10-annobin" + until yum -y install ${DEVTOOLSET10_PKGLIST}; do echo "waiting" sleep 1 done - update-alternatives --install /usr/bin/gcc gcc /opt/rh/gcc-toolset-12/root/usr/bin/gcc 10 - update-alternatives --install /usr/bin/g++ g++ /opt/rh/gcc-toolset-12/root/usr/bin/g++ 10 + update-alternatives --install /usr/bin/gcc gcc /opt/rh/gcc-toolset-10/root/usr/bin/gcc 10 + update-alternatives --install /usr/bin/g++ g++ /opt/rh/gcc-toolset-10/root/usr/bin/g++ 10 gcc --version fi else From 2f1909d6f442d72a5ac0dfe78b9141d8797078a8 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Fri, 8 Dec 2023 09:27:20 +0200 Subject: [PATCH 09/10] RM-1274 PXB-8.2 --- .../innobase/xtrabackup/utils/debian/changelog | 4 ++++ storage/innobase/xtrabackup/utils/debian/control | 14 +++++++------- .../debian/percona-xtrabackup-test-81.install | 2 +- storage/innobase/xtrabackup/utils/debian/rules | 16 ++++++++-------- .../utils/percona-xtrabackup-8.0_builder.sh | 2 +- .../xtrabackup/utils/percona-xtrabackup.spec | 2 +- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/storage/innobase/xtrabackup/utils/debian/changelog b/storage/innobase/xtrabackup/utils/debian/changelog index 7edaf3ddd822..f086dcd08581 100644 --- a/storage/innobase/xtrabackup/utils/debian/changelog +++ b/storage/innobase/xtrabackup/utils/debian/changelog @@ -1,3 +1,7 @@ +percona-xtrabackup-82 (8.2) unstable; urgency=low + + * Packaging changes for version 8.2 + percona-xtrabackup-81 (8.1) unstable; urgency=low * Packaging changes for version 8.1 diff --git a/storage/innobase/xtrabackup/utils/debian/control b/storage/innobase/xtrabackup/utils/debian/control index 0838679d7d71..c7c10a0a6508 100644 --- a/storage/innobase/xtrabackup/utils/debian/control +++ b/storage/innobase/xtrabackup/utils/debian/control @@ -1,4 +1,4 @@ -Source: percona-xtrabackup-81 +Source: percona-xtrabackup-82 Section: database Priority: extra Maintainer: Percona Development Team @@ -25,11 +25,11 @@ Build-Depends: automake, Standards-Version: 3.9.5 Homepage: http://www.percona.com/software/percona-xtrabackup -Package: percona-xtrabackup-81 +Package: percona-xtrabackup-82 Architecture: any Depends: libdbd-mysql-perl, libcurl4-openssl-dev, rsync, zstd, ${misc:Depends}, ${shlibs:Depends} Provides: xtrabackup -Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80 +Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80, percona-xtrabackup-81 Breaks: xtrabackup (<< 2.0.0~) Replaces: xtrabackup (<< 2.0.0~) Enhances: mysql-server @@ -39,17 +39,17 @@ Description: Open source backup tool for InnoDB and XtraDB InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server/MariaDB servers, and has many advanced features. -Package: percona-xtrabackup-dbg-81 +Package: percona-xtrabackup-dbg-82 Section: debug Architecture: any -Depends: percona-xtrabackup-81 (= ${binary:Version}), ${misc:Depends} +Depends: percona-xtrabackup-82 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for Percona XtraBackup Debug symbols for the binaries in percona-xtrabackup. Install this package if you need to run any of those with gdb. -Package: percona-xtrabackup-test-81 +Package: percona-xtrabackup-test-82 Architecture: any -Depends: mysql-client, percona-xtrabackup-81, ${misc:Depends} +Depends: mysql-client, percona-xtrabackup-82, ${misc:Depends} Description: Test suite for Percona XtraBackup Test suite for Percona XtraBackup. Install this package if you intend to run XtraBackup's test suite. diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.install b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.install index fde5a0e7c204..8cf0e4d8b27b 100644 --- a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.install +++ b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.install @@ -1 +1 @@ -/usr/share/percona-xtrabackup-test-81 +/usr/share/percona-xtrabackup-test-82 diff --git a/storage/innobase/xtrabackup/utils/debian/rules b/storage/innobase/xtrabackup/utils/debian/rules index ef82402a4541..1cfef3536d68 100755 --- a/storage/innobase/xtrabackup/utils/debian/rules +++ b/storage/innobase/xtrabackup/utils/debian/rules @@ -24,14 +24,14 @@ override_dh_auto_configure: ifeq "$(DEB_DUMMY)" "" ( test -d $(builddirdebug) || mkdir $(builddirdebug) ) && cd $(builddirdebug) && \ cmake .. -DBUILD_CONFIG=xtrabackup_release -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-81 \ + -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-82 \ -DINSTALL_MANDIR=/usr/share/man -DWITH_MAN_PAGES=1 -DMINIMAL_RELWITHDEBINFO=OFF \ -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ -DINSTALL_PLUGINDIR=lib/xtrabackup/plugin -DFORCE_INSOURCE_BUILD=1 -DWITH_ZLIB=bundled -DWITH_ZSTD=bundled -DWITH_PROTOBUF=bundled && \ cd .. ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ cmake .. -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-81 \ + -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-82 \ -DINSTALL_MANDIR=/usr/share/man -DWITH_MAN_PAGES=1 -DMINIMAL_RELWITHDEBINFO=OFF \ -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ -DINSTALL_PLUGINDIR=lib/xtrabackup/plugin -DFORCE_INSOURCE_BUILD=1 -DWITH_ZLIB=bundled -DWITH_ZSTD=bundled -DWITH_PROTOBUF=bundled @@ -61,15 +61,15 @@ override_dh_auto_install: override_dh_install: dh_install - mkdir -p debian/percona-xtrabackup-81/usr/lib/private/ - mkdir -p debian/percona-xtrabackup-81/usr/bin/ - cp ./$(builddir)/library_output_directory/libprotobuf-lite.so* debian/percona-xtrabackup-81/usr/lib/private/ - cp ./$(builddirdebug)/runtime_output_directory/xtrabackup debian/percona-xtrabackup-81/usr/bin/xtrabackup-debug - patchelf --debug --set-rpath $(rpath) debian/percona-xtrabackup-81/usr/bin/xtrabackup-debug + mkdir -p debian/percona-xtrabackup-82/usr/lib/private/ + mkdir -p debian/percona-xtrabackup-82/usr/bin/ + cp ./$(builddir)/library_output_directory/libprotobuf-lite.so* debian/percona-xtrabackup-82/usr/lib/private/ + cp ./$(builddirdebug)/runtime_output_directory/xtrabackup debian/percona-xtrabackup-82/usr/bin/xtrabackup-debug + patchelf --debug --set-rpath $(rpath) debian/percona-xtrabackup-82/usr/bin/xtrabackup-debug @echo "RULES.$@" override_dh_strip: - dh_strip --dbg-package=percona-xtrabackup-dbg-81 + dh_strip --dbg-package=percona-xtrabackup-dbg-82 dh_strip -Xlibprotobuf-lite %: diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index b485761fff63..827ddac0b307 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -510,7 +510,7 @@ build_source_deb(){ echo "DEB_RELEASE=${DEB_RELEASE}" >> ${CURDIR}/percona-xtrabackup-8.0.properties - NEWTAR=${NAME}-81_${VERSION}.orig.tar.gz + NEWTAR=${NAME}-82_${VERSION}.orig.tar.gz mv ${TARFILE} ${NEWTAR} tar xzf ${NEWTAR} diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec b/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec index eb427b02004c..f72701921f9e 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec @@ -32,7 +32,7 @@ Source: percona-xtrabackup-%{version}%{xb_version_extra}.tar.gz BuildRequires: %{cmake_bin}, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel, zlib-devel, libev-devel openssl-devel BuildRequires: libcurl-devel -Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80 +Conflicts: percona-xtrabackup-21, percona-xtrabackup-22, percona-xtrabackup, percona-xtrabackup-24, percona-xtrabackup-80, percona-xtrabackup-81 Requires: perl(DBD::mysql), rsync, zstd Requires: perl(Digest::MD5) BuildRoot: %{_tmppath}/%{name}-%{version}%{xb_version_extra}-root From 4f74be69a6c8f8fc95c2d63a62ae01ce3efeb2fc Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Fri, 8 Dec 2023 15:07:11 +0200 Subject: [PATCH 10/10] RM-1274 PXB-8.2 --- .../{percona-xtrabackup-81.docs => percona-xtrabackup-82.docs} | 0 ...ercona-xtrabackup-81.install => percona-xtrabackup-82.install} | 0 ....lintian-overrides => percona-xtrabackup-82.lintian-overrides} | 0 ...abackup-test-81.install => percona-xtrabackup-test-82.install} | 0 ...ian-overrides => percona-xtrabackup-test-82.lintian-overrides} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-81.docs => percona-xtrabackup-82.docs} (100%) rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-81.install => percona-xtrabackup-82.install} (100%) rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-81.lintian-overrides => percona-xtrabackup-82.lintian-overrides} (100%) rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-test-81.install => percona-xtrabackup-test-82.install} (100%) rename storage/innobase/xtrabackup/utils/debian/{percona-xtrabackup-test-81.lintian-overrides => percona-xtrabackup-test-82.lintian-overrides} (100%) diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-81.docs b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-82.docs similarity index 100% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-81.docs rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-82.docs diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-81.install b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-82.install similarity index 100% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-81.install rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-82.install diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-81.lintian-overrides b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-82.lintian-overrides similarity index 100% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-81.lintian-overrides rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-82.lintian-overrides diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.install b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-82.install similarity index 100% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.install rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-82.install diff --git a/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.lintian-overrides b/storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-82.lintian-overrides similarity index 100% rename from storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-81.lintian-overrides rename to storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test-82.lintian-overrides