From a49d87d12f68b72d6dea22fb853ce9cef7918510 Mon Sep 17 00:00:00 2001 From: Alina Derkach Date: Wed, 29 Nov 2023 17:18:59 +0200 Subject: [PATCH 01/17] PT-2291 Release notes for Percona Toolkit version 3.5.6 modified: Changelog modified: Makefile.PL modified: config/sphinx-build/conf.py modified: docs/release_notes.rst --- Changelog | 11 +++++++++++ Makefile.PL | 2 +- config/sphinx-build/conf.py | 2 +- docs/release_notes.rst | 20 +++++++++++++++++++- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index f034aad6..ce2af274 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,16 @@ Changelog for Percona Toolkit +v3.5.6 released 2023-12- + +* Improvement PT-1860: pt-osc case sensitivity issue (Thanks to ikruglov implementing this improvement) +* Fixed bug PT-2083: Pt-archiver --charset option is not working for MySQL8.0 (Thanks to Yijian Zhang for reporting this issue) +* Fixed bug PT-2109: pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" +* Fixed bug PT-2207: pt-archiver doesn't work when ANSI_QUOTES is set in sql_mode +* Fixed bug PT-2268: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 (Thanks to Hristo Mitev for reorting this issue) +* Fixed bug PT-2279: Option --charset is confusing when set to utf8mb4 +* Fixed bug PT-2281: provide container name for copying files in the dump +* Fixed bug PT-2286: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reorting this issue) + v3.5.5 released 2023-10-03 * Feature PR-645: Add after nibble hook to pt-online-schema-change (Thanks to Marcelo HP Ferreira for the contribution) diff --git a/Makefile.PL b/Makefile.PL index 0e8e8280..4879ad6f 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -11,7 +11,7 @@ MAKE_GOTOOLS WriteMakefile( NAME => 'Percona::Toolkit', - VERSION => '3.5.5', + VERSION => '3.5.6', EXE_FILES => [ map { (my $name = $_) =~ s/^bin.//; diff --git a/config/sphinx-build/conf.py b/config/sphinx-build/conf.py index b56448fa..b445ec79 100644 --- a/config/sphinx-build/conf.py +++ b/config/sphinx-build/conf.py @@ -50,7 +50,7 @@ copyright = u'2023, Percona LLC and/or its affiliates' # The short X.Y version. version = '3.5' # The full version, including alpha/beta/rc tags. -release = '3.5.5' +release = '3.5.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 49a6ca62..e8e1ee22 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,6 +1,24 @@ Percona Toolkit *************** +v3.5.6 released 2023-12- +============================== + +Improvements +------------------------------------------------------------ + +* :jirabug:`PT-1860`: pt-osc case sensitivity issue (Thanks to ikruglov implementing this improvement) + +Bugs Fixed +------------ + +* :jirabug:`PT-2083`: Pt-archiver --charset option is not working for MySQL8.0 (Thanks to Yijian Zhang for reporting this issue) +* :jirabug:`PT-2109`: pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" +* :jirabug:`PT-2207`: pt-archiver doesn't work when ANSI_QUOTES is set in sql_mode +* :jirabug:`PT-2268`: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 (Thanks to Hristo Mitev for reorting this issue) +* :jirabug:`PT-2279`: Option --charset is confusing when set to utf8mb4 +* :jirabug:`PT-2281`: provide container name for copying files in the dump +* :jirabug:`PT-2286`: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reorting this issue) v3.5.5 released 2023-10-03 ============================== @@ -9,7 +27,7 @@ New Features ------------------------------------------------------------ * :jirabug:`PT-2168`: PT-OSC shouldn't fail while unable to monitor a replica node -* `PR-645`: Add after nibble hook to pt-online-schema-change (Thanks to Marcelo HP Ferreira for the implementing this feature) +* `PR-645`: Add after nibble hook to pt-online-schema-change (Thanks to Marcelo HP Ferreira for implementing this feature) * :jirabug:`PT-2258`: Pass tbl as argument for on_copy_rows_after_nibble Improvements From c6bec028c3251f8fc806cf31be68db155570c8f2 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Thu, 7 Dec 2023 12:57:07 +0300 Subject: [PATCH 02/17] Changelog updated --- Changelog | 21 +++++++++++++++++---- docs/release_notes.rst | 4 ++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index ce2af274..6cebce62 100644 --- a/Changelog +++ b/Changelog @@ -2,14 +2,27 @@ Changelog for Percona Toolkit v3.5.6 released 2023-12- -* Improvement PT-1860: pt-osc case sensitivity issue (Thanks to ikruglov implementing this improvement) -* Fixed bug PT-2083: Pt-archiver --charset option is not working for MySQL8.0 (Thanks to Yijian Zhang for reporting this issue) +* Improvement PT-1860: pt-osc case sensitivity issue (Thanks to Ivan Kruglov for the contribution) +* Improvement PR-691: Fix newly discovered typos (Thanks to Viktor Szépe for the contribution) +* Improvement PR-681: Introduce EditorConfig (Thanks to Viktor Szépe for the contribution) +* Improvement PR-509: added new hook before_die (Thanks to Ilaria Migliozzi for the contribution) +* Improvement PR-706: Follow PR-429 unstop option with testcase (Thanks to fraff for the contribution) +* Improvement PR-720: build Go tools from top Makefile (Thanks to Sami Ahlroos and Yoann La Cancellera for the contribution) +* Improvement PR-716: Make OrderedBy not exported (Thanks to Viktor Szépe for the contribution) +* Improvement PR-715: Fix variable collision with imported package name (Thanks to Viktor Szépe for the contribution) +* Improvement PR-714: Fix MongoDB Security (Thanks to Viktor Szépe for the contribution) +* Improvement PR-713: Fix MongoDB StorageEngine (Thanks to Viktor Szépe for the contribution) +* Improvement PR-712: ARM64 support for macOS +* Fixed bug PT-2064: pt-archiver: Can't call method "rollback" on an undefined value (Thanks to Jakob for the contribution) +* --Fixed bug PT-2083: Pt-archiver --charset option is not working for MySQL8.0 * Fixed bug PT-2109: pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" * Fixed bug PT-2207: pt-archiver doesn't work when ANSI_QUOTES is set in sql_mode -* Fixed bug PT-2268: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 (Thanks to Hristo Mitev for reorting this issue) +* Fixed bug PT-2211: This pstack return error code line number (Thanks to Zongzhi Chen for the contribution) +* --Fixed bug PT-2268: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 +* Fixed bug PT-2277: pt-visual-explain errors out on some valid inputs (Thanks to Jason Ng for the contribution) * Fixed bug PT-2279: Option --charset is confusing when set to utf8mb4 * Fixed bug PT-2281: provide container name for copying files in the dump -* Fixed bug PT-2286: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reorting this issue) +* --Fixed bug PT-2286: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reporting this issue) v3.5.5 released 2023-10-03 diff --git a/docs/release_notes.rst b/docs/release_notes.rst index e8e1ee22..b240b4cd 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -15,10 +15,10 @@ Bugs Fixed * :jirabug:`PT-2083`: Pt-archiver --charset option is not working for MySQL8.0 (Thanks to Yijian Zhang for reporting this issue) * :jirabug:`PT-2109`: pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" * :jirabug:`PT-2207`: pt-archiver doesn't work when ANSI_QUOTES is set in sql_mode -* :jirabug:`PT-2268`: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 (Thanks to Hristo Mitev for reorting this issue) +* :jirabug:`PT-2268`: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 (Thanks to Hristo Mitev for reporting this issue) * :jirabug:`PT-2279`: Option --charset is confusing when set to utf8mb4 * :jirabug:`PT-2281`: provide container name for copying files in the dump -* :jirabug:`PT-2286`: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reorting this issue) +* :jirabug:`PT-2286`: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reporting this issue) v3.5.5 released 2023-10-03 ============================== From 6cdb5a07cd55a4214aab154d5d9001d6cbe5679c Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Thu, 7 Dec 2023 15:35:19 +0300 Subject: [PATCH 03/17] More changes into Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 6cebce62..17a4379b 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ Changelog for Percona Toolkit v3.5.6 released 2023-12- +* Feature PR-669: Add pt-galera-log-explainer * Improvement PT-1860: pt-osc case sensitivity issue (Thanks to Ivan Kruglov for the contribution) * Improvement PR-691: Fix newly discovered typos (Thanks to Viktor Szépe for the contribution) * Improvement PR-681: Introduce EditorConfig (Thanks to Viktor Szépe for the contribution) From a8ba844bcd0443f8dfc425231d2c3c9655a2e855 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Thu, 7 Dec 2023 15:49:43 +0300 Subject: [PATCH 04/17] More changes into Changelog and sorted output --- Changelog | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Changelog b/Changelog index 17a4379b..ab3bfd19 100644 --- a/Changelog +++ b/Changelog @@ -4,16 +4,20 @@ v3.5.6 released 2023-12- * Feature PR-669: Add pt-galera-log-explainer * Improvement PT-1860: pt-osc case sensitivity issue (Thanks to Ivan Kruglov for the contribution) -* Improvement PR-691: Fix newly discovered typos (Thanks to Viktor Szépe for the contribution) -* Improvement PR-681: Introduce EditorConfig (Thanks to Viktor Szépe for the contribution) +* Improvement PR-388: Check undefined skip check slave lag schema change (Thanks to Chrys Swingler for the contribution) +* Improvement PR-471: Support adding explain output for slow query in JSON +report as well (Thanks to Ayush Goyal for the contribution) * Improvement PR-509: added new hook before_die (Thanks to Ilaria Migliozzi for the contribution) +* Improvement PR-604: Only rollback destination if it's defined (Thanks to Jakob for the contribution) +* Improvement PR-681: Introduce EditorConfig (Thanks to Viktor Szépe for the contribution) +* Improvement PR-691: Fix newly discovered typos (Thanks to Viktor Szépe for the contribution) * Improvement PR-706: Follow PR-429 unstop option with testcase (Thanks to fraff for the contribution) -* Improvement PR-720: build Go tools from top Makefile (Thanks to Sami Ahlroos and Yoann La Cancellera for the contribution) -* Improvement PR-716: Make OrderedBy not exported (Thanks to Viktor Szépe for the contribution) -* Improvement PR-715: Fix variable collision with imported package name (Thanks to Viktor Szépe for the contribution) -* Improvement PR-714: Fix MongoDB Security (Thanks to Viktor Szépe for the contribution) -* Improvement PR-713: Fix MongoDB StorageEngine (Thanks to Viktor Szépe for the contribution) * Improvement PR-712: ARM64 support for macOS +* Improvement PR-713: Fix MongoDB StorageEngine (Thanks to Viktor Szépe for the contribution) +* Improvement PR-714: Fix MongoDB Security (Thanks to Viktor Szépe for the contribution) +* Improvement PR-715: Fix variable collision with imported package name (Thanks to Viktor Szépe for the contribution) +* Improvement PR-716: Make OrderedBy not exported (Thanks to Viktor Szépe for the contribution) +* Improvement PR-720: build Go tools from top Makefile (Thanks to Sami Ahlroos and Yoann La Cancellera for the contribution) * Fixed bug PT-2064: pt-archiver: Can't call method "rollback" on an undefined value (Thanks to Jakob for the contribution) * --Fixed bug PT-2083: Pt-archiver --charset option is not working for MySQL8.0 * Fixed bug PT-2109: pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" From 05f193cb3443e6eb83d33574fdc88820dd4895ca Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Thu, 7 Dec 2023 21:58:36 +0300 Subject: [PATCH 05/17] PT-2291 - Release notes for Percona Toolkit version 3.5.6 - Updated Changelog --- Changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index ab3bfd19..fd031540 100644 --- a/Changelog +++ b/Changelog @@ -19,7 +19,7 @@ report as well (Thanks to Ayush Goyal for the contribution) * Improvement PR-716: Make OrderedBy not exported (Thanks to Viktor Szépe for the contribution) * Improvement PR-720: build Go tools from top Makefile (Thanks to Sami Ahlroos and Yoann La Cancellera for the contribution) * Fixed bug PT-2064: pt-archiver: Can't call method "rollback" on an undefined value (Thanks to Jakob for the contribution) -* --Fixed bug PT-2083: Pt-archiver --charset option is not working for MySQL8.0 +* Fixed bug PT-2083: Pt-archiver --charset option is not working for MySQL8.0 * Fixed bug PT-2109: pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" * Fixed bug PT-2207: pt-archiver doesn't work when ANSI_QUOTES is set in sql_mode * Fixed bug PT-2211: This pstack return error code line number (Thanks to Zongzhi Chen for the contribution) @@ -27,7 +27,7 @@ report as well (Thanks to Ayush Goyal for the contribution) * Fixed bug PT-2277: pt-visual-explain errors out on some valid inputs (Thanks to Jason Ng for the contribution) * Fixed bug PT-2279: Option --charset is confusing when set to utf8mb4 * Fixed bug PT-2281: provide container name for copying files in the dump -* --Fixed bug PT-2286: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reporting this issue) +* Fixed bug PT-2286: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reporting this issue) v3.5.5 released 2023-10-03 From 72d3805cb42da02440736a3a28f4d9415fed0a42 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Thu, 7 Dec 2023 23:29:02 +0300 Subject: [PATCH 06/17] PT-2291 - Release notes for Percona Toolkit version 3.5.6 - Updated Changelog --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index fd031540..627a2621 100644 --- a/Changelog +++ b/Changelog @@ -23,7 +23,7 @@ report as well (Thanks to Ayush Goyal for the contribution) * Fixed bug PT-2109: pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" * Fixed bug PT-2207: pt-archiver doesn't work when ANSI_QUOTES is set in sql_mode * Fixed bug PT-2211: This pstack return error code line number (Thanks to Zongzhi Chen for the contribution) -* --Fixed bug PT-2268: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 +* Fixed bug PT-2268: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 * Fixed bug PT-2277: pt-visual-explain errors out on some valid inputs (Thanks to Jason Ng for the contribution) * Fixed bug PT-2279: Option --charset is confusing when set to utf8mb4 * Fixed bug PT-2281: provide container name for copying files in the dump From d04968b20c7cec803adea9624705abbf150ed997 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Mon, 11 Dec 2023 14:29:49 +0300 Subject: [PATCH 07/17] Updated release notes --- docs/release_notes.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index b240b4cd..0f5e8170 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -4,18 +4,40 @@ Percona Toolkit v3.5.6 released 2023-12- ============================== +New Features +------------------------------------------------------------ + +* `PR-669`: Add pt-galera-log-explainer + Improvements ------------------------------------------------------------ * :jirabug:`PT-1860`: pt-osc case sensitivity issue (Thanks to ikruglov implementing this improvement) +* `PR-388`: Check undefined skip check slave lag schema change (Thanks to Chrys Swingler for the contribution) +* `PR-471`: Support adding explain output for slow query in JSON +report as well (Thanks to Ayush Goyal for the contribution) +* `PR-509`: added new hook before_die (Thanks to Ilaria Migliozzi for the contribution) +* `PR-604`: Only rollback destination if it's defined (Thanks to Jakob for the contribution) +* `PR-681`: Introduce EditorConfig (Thanks to Viktor Szépe for the contribution) +* `PR-691`: Fix newly discovered typos (Thanks to Viktor Szépe for the contribution) +* `PR-706`: Follow PR-429 unstop option with testcase (Thanks to fraff for the contribution) +* `PR-712`: ARM64 support for macOS +* `PR-713`: Fix MongoDB StorageEngine (Thanks to Viktor Szépe for the contribution) +* `PR-714`: Fix MongoDB Security (Thanks to Viktor Szépe for the contribution) +* `PR-715`: Fix variable collision with imported package name (Thanks to Viktor Szépe for the contribution) +* `PR-716`: Make OrderedBy not exported (Thanks to Viktor Szépe for the contribution) +* `PR-720`: build Go tools from top Makefile (Thanks to Sami Ahlroos and Yoann La Cancellera for the contribution) Bugs Fixed ------------ +* :jirabug:`PT-2064`: pt-archiver: Can't call method "rollback" on an undefined value (Thanks to Jakob for the contribution) * :jirabug:`PT-2083`: Pt-archiver --charset option is not working for MySQL8.0 (Thanks to Yijian Zhang for reporting this issue) * :jirabug:`PT-2109`: pt-mysql-summary throws an error when using sql_mode="ANSI_QUOTES" * :jirabug:`PT-2207`: pt-archiver doesn't work when ANSI_QUOTES is set in sql_mode +* :jirabug:`PT-2211`: This pstack return error code line number (Thanks to Zongzhi Chen for the contribution) * :jirabug:`PT-2268`: pt-online-schema-change 3.5.5 breaks on mysql5.7 with server_id 0 (Thanks to Hristo Mitev for reporting this issue) +* :jirabug:`PT-2277`: pt-visual-explain errors out on some valid inputs (Thanks to Jason Ng for the contribution) * :jirabug:`PT-2279`: Option --charset is confusing when set to utf8mb4 * :jirabug:`PT-2281`: provide container name for copying files in the dump * :jirabug:`PT-2286`: CVE reported in Percona Toolkit version 3.5.5 related to GO (Thanks to Kushal Haldar for reporting this issue) From 504e64fd1799150fac39189b34f15adf40281a3c Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Mon, 11 Dec 2023 15:57:57 +0300 Subject: [PATCH 08/17] typo in Changelog --- Changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 627a2621..e3cd88a7 100644 --- a/Changelog +++ b/Changelog @@ -5,8 +5,7 @@ v3.5.6 released 2023-12- * Feature PR-669: Add pt-galera-log-explainer * Improvement PT-1860: pt-osc case sensitivity issue (Thanks to Ivan Kruglov for the contribution) * Improvement PR-388: Check undefined skip check slave lag schema change (Thanks to Chrys Swingler for the contribution) -* Improvement PR-471: Support adding explain output for slow query in JSON -report as well (Thanks to Ayush Goyal for the contribution) +* Improvement PR-471: Support adding explain output for slow query in JSON report as well (Thanks to Ayush Goyal for the contribution) * Improvement PR-509: added new hook before_die (Thanks to Ilaria Migliozzi for the contribution) * Improvement PR-604: Only rollback destination if it's defined (Thanks to Jakob for the contribution) * Improvement PR-681: Introduce EditorConfig (Thanks to Viktor Szépe for the contribution) From becd4722db7280d4a249be4cfda1714f57a43ce0 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Tue, 12 Dec 2023 23:55:54 +0300 Subject: [PATCH 09/17] PT-2291 - Release notes for Percona Toolkit version 3.5.6 - Removed extra row for the same contribution --- Changelog | 1 - docs/release_notes.rst | 1 - 2 files changed, 2 deletions(-) diff --git a/Changelog b/Changelog index e3cd88a7..d985d355 100644 --- a/Changelog +++ b/Changelog @@ -7,7 +7,6 @@ v3.5.6 released 2023-12- * Improvement PR-388: Check undefined skip check slave lag schema change (Thanks to Chrys Swingler for the contribution) * Improvement PR-471: Support adding explain output for slow query in JSON report as well (Thanks to Ayush Goyal for the contribution) * Improvement PR-509: added new hook before_die (Thanks to Ilaria Migliozzi for the contribution) -* Improvement PR-604: Only rollback destination if it's defined (Thanks to Jakob for the contribution) * Improvement PR-681: Introduce EditorConfig (Thanks to Viktor Szépe for the contribution) * Improvement PR-691: Fix newly discovered typos (Thanks to Viktor Szépe for the contribution) * Improvement PR-706: Follow PR-429 unstop option with testcase (Thanks to fraff for the contribution) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 0f5e8170..05294a1e 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -17,7 +17,6 @@ Improvements * `PR-471`: Support adding explain output for slow query in JSON report as well (Thanks to Ayush Goyal for the contribution) * `PR-509`: added new hook before_die (Thanks to Ilaria Migliozzi for the contribution) -* `PR-604`: Only rollback destination if it's defined (Thanks to Jakob for the contribution) * `PR-681`: Introduce EditorConfig (Thanks to Viktor Szépe for the contribution) * `PR-691`: Fix newly discovered typos (Thanks to Viktor Szépe for the contribution) * `PR-706`: Follow PR-429 unstop option with testcase (Thanks to fraff for the contribution) From e7d15f13b05e92dbfffc248082c1b44879114ecc Mon Sep 17 00:00:00 2001 From: Evgeniy Patlan Date: Mon, 18 Dec 2023 16:15:14 +0200 Subject: [PATCH 10/17] ENG-7 fix build --- config/deb/rules | 2 +- config/rpm/percona-toolkit.spec | 3 ++- config/scripts/pt_builder.sh | 8 +------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/config/deb/rules b/config/deb/rules index f342701f..a055414a 100755 --- a/config/deb/rules +++ b/config/deb/rules @@ -5,7 +5,7 @@ build: build-stamp build-stamp: dh_testdir perl Makefile.PL INSTALLDIRS=vendor - $(MAKE) + VERSION=3.5.6 $(MAKE) touch build-stamp clean: diff --git a/config/rpm/percona-toolkit.spec b/config/rpm/percona-toolkit.spec index 1291711c..05e9764b 100644 --- a/config/rpm/percona-toolkit.spec +++ b/config/rpm/percona-toolkit.spec @@ -40,11 +40,12 @@ visit http://www.percona.com/software/. %build %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null #sed -i '499d' Makefile -make %{?_smp_mflags} +VERSION=3.5.6 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +for file in $(diff -rq bin/ $RPM_BUILD_ROOT/usr/bin | awk '{print $NF}'); do cp bin/$file $RPM_BUILD_ROOT/usr/bin; done find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type f -name 'percona-toolkit.pod' -exec rm -f {} ';' diff --git a/config/scripts/pt_builder.sh b/config/scripts/pt_builder.sh index 42807801..a6115ce2 100644 --- a/config/scripts/pt_builder.sh +++ b/config/scripts/pt_builder.sh @@ -160,7 +160,7 @@ install_go() { rm -rf /usr/local/go /usr/local/go1.8 /usr/local/go1.9 mv go1.9 /usr/local/ ln -s /usr/local/go1.9 /usr/local/go - GO_VERSION=1.21.1 + GO_VERSION=1.21.5 wget --progress=dot:giga https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -O /tmp/golang.tar.gz tar -C /usr/local -xzf /tmp/golang.tar.gz update-alternatives --install "/usr/bin/go" "go" "/usr/local/go/bin/go" 0 @@ -370,12 +370,6 @@ build_rpm(){ rm -fr rpmbuild mkdir -vp rpmbuild/{SOURCES,SPECS,BUILD,SRPMS,RPMS} cp $SRC_RPM rpmbuild/SRPMS/ - - cd rpmbuild/SPECS - echo '%undefine _missing_build_ids_terminate_build' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec - echo '%define debug_package %{nil}' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec - sed -i "s/@@ARHITECTURE@@/x86_64/" percona-toolkit.spec - # cd $WORKDIR RHEL=$(rpm --eval %rhel) ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g') From cce558354551aacfb56042a288fb8a04a010b433 Mon Sep 17 00:00:00 2001 From: Evgeniy Patlan Date: Tue, 19 Dec 2023 13:28:16 +0200 Subject: [PATCH 11/17] ENG-7 fix build on el8 --- config/rpm/percona-toolkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rpm/percona-toolkit.spec b/config/rpm/percona-toolkit.spec index 05e9764b..bfb2fbc4 100644 --- a/config/rpm/percona-toolkit.spec +++ b/config/rpm/percona-toolkit.spec @@ -45,7 +45,7 @@ VERSION=3.5.6 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -for file in $(diff -rq bin/ $RPM_BUILD_ROOT/usr/bin | awk '{print $NF}'); do cp bin/$file $RPM_BUILD_ROOT/usr/bin; done +for file in $(diff -rq bin/ $RPM_BUILD_ROOT/usr/bin | awk '{print $NF}'); do cp bin/$file $RPM_BUILD_ROOT/usr/bin || true; done find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -type f -name 'percona-toolkit.pod' -exec rm -f {} ';' From cb6955c04c0c36bb851f23517644f4ea114c9736 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Wed, 20 Dec 2023 00:43:35 +0300 Subject: [PATCH 12/17] updated docs/percona-toolkit.pod --- docs/percona-toolkit.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/percona-toolkit.pod b/docs/percona-toolkit.pod index c54054fe..04f061b2 100644 --- a/docs/percona-toolkit.pod +++ b/docs/percona-toolkit.pod @@ -575,6 +575,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA. =head1 VERSION -Percona Toolkit v3.5.6 released 2023-12-18 +Percona Toolkit v3.5.6 released 2023-12-20 =cut From 8cf261c3f93ad47c0edafa52b604b293c99c6431 Mon Sep 17 00:00:00 2001 From: Evgeniy Patlan Date: Tue, 19 Dec 2023 16:23:05 +0200 Subject: [PATCH 13/17] ENG-7 fix deb build --- config/scripts/pt_builder.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/config/scripts/pt_builder.sh b/config/scripts/pt_builder.sh index a6115ce2..77b9474e 100644 --- a/config/scripts/pt_builder.sh +++ b/config/scripts/pt_builder.sh @@ -233,7 +233,7 @@ install_deps() { sleep 1 done fi - if [ $DEBIAN_VERSION = bionic -o $DEBIAN_VERSION = focal -o $DEBIAN_VERSION = bullseye -o $DEBIAN_VERSION = buster -o $DEBIAN_VERSION = xenial -o $DEBIAN_VERSION = jammy ]; then + if [ $DEBIAN_VERSION = bionic -o $DEBIAN_VERSION = focal -o $DEBIAN_VERSION = bullseye -o $DEBIAN_VERSION = buster -o $DEBIAN_VERSION = bookworm -o $DEBIAN_VERSION = jammy -o $DEBIAN_VERSION = xenial ]; then until apt-get update; do echo "waiting" sleep 1 @@ -515,7 +515,23 @@ build_deb(){ mkdir -p $WORKDIR/deb cp $WORKDIR/*.*deb $WORKDIR/deb cp $WORKDIR/*.*deb $CURDIR/deb + if [ "x$DEBIAN_VERSION" = "xjammy" ]; then + for dir in $WORKDIR/deb $CURDIR/deb; do + cd $dir + COMP=gzip + for i in *.deb; do + echo "$i" + mkdir "$i.extract" + dpkg-deb -R "$i" "$i.extract" + rm "$i" + dpkg-deb -b "-Z$COMP" "$i.extract" "$i" + rm -rf "$i.extract" + done + done + fi + cd $WORKDIR } +#=========================== #main export GIT_SSL_NO_VERIFY=1 CURDIR=$(pwd) From 1edf41124af5e8af6e115bb43e7403968487e434 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 00:04:30 +0000 Subject: [PATCH 14/17] Bump golang.org/x/crypto from 0.16.0 to 0.17.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.16.0 to 0.17.0. - [Commits](https://github.com/golang/crypto/compare/v0.16.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c880452a..802dcea4 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.8.4 go.mongodb.org/mongo-driver v1.13.1 - golang.org/x/crypto v0.16.0 + golang.org/x/crypto v0.17.0 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 k8s.io/api v0.28.4 diff --git a/go.sum b/go.sum index c1c572c7..ef24f919 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,8 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= From c47e6d5e833595ad87e18124334e834b63566875 Mon Sep 17 00:00:00 2001 From: Evgeniy Patlan Date: Wed, 20 Dec 2023 12:06:49 +0200 Subject: [PATCH 15/17] ENG-7 fix version --- config/rpm/percona-toolkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rpm/percona-toolkit.spec b/config/rpm/percona-toolkit.spec index bfb2fbc4..3d7f43a0 100644 --- a/config/rpm/percona-toolkit.spec +++ b/config/rpm/percona-toolkit.spec @@ -44,7 +44,7 @@ VERSION=3.5.6 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +VERSION=3.5.6 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT for file in $(diff -rq bin/ $RPM_BUILD_ROOT/usr/bin | awk '{print $NF}'); do cp bin/$file $RPM_BUILD_ROOT/usr/bin || true; done find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' From 089452e9a5fde304772210e4703189d5418502bf Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Thu, 21 Dec 2023 17:15:35 +0300 Subject: [PATCH 16/17] Update Changelog Co-authored-by: Alina Derkach --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index d985d355..a98d7267 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,6 @@ Changelog for Percona Toolkit -v3.5.6 released 2023-12- +v3.5.6 released 2023-12-21 * Feature PR-669: Add pt-galera-log-explainer * Improvement PT-1860: pt-osc case sensitivity issue (Thanks to Ivan Kruglov for the contribution) From 9fc0e72ea0d70645c92d5cc547df0ceaf900e732 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Thu, 21 Dec 2023 17:15:41 +0300 Subject: [PATCH 17/17] Update docs/release_notes.rst Co-authored-by: Alina Derkach --- docs/release_notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 05294a1e..2453151d 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,7 +1,7 @@ Percona Toolkit *************** -v3.5.6 released 2023-12- +v3.5.6 released 2023-12-21 ============================== New Features