Skip to content

Commit

Permalink
Merge branch '3.x' into pt-2247
Browse files Browse the repository at this point in the history
  • Loading branch information
svetasmirnova committed May 16, 2024
2 parents 0924e35 + c047741 commit bc23d08
Show file tree
Hide file tree
Showing 277 changed files with 165,549 additions and 1,259 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{*.pm,bin/*}]
indent_size = 3

[*.go]
indent_style = tab
16 changes: 16 additions & 0 deletions .github/workflows/libmodulesupdated.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: libmodules_has_been_updated

on:
pull_request:
branches: [ "3.x" ]

jobs:

libmodulescheck:
runs-on: ubuntu-latest
strategy:
fail-fast: true
steps:
- uses: actions/checkout@v4
- name: run util/check_bin_md5sum
run: ./util/check_bin_md5sum
10 changes: 5 additions & 5 deletions .github/workflows/toolkit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.21'
- name: Build
run: cd src/go; make linux-amd64; cd ../../

- name: Build the Docker image
run: echo "FROM oraclelinux:9-slim" > Dockerfile; echo "COPY bin/* /usr/bin/" >> Dockerfile; docker build . --file Dockerfile --tag percona-toolkit:${{ github.sha }}
run: echo "FROM oraclelinux:9-slim" > Dockerfile; echo "RUN microdnf -y update" >> Dockerfile; echo "COPY bin/* /usr/bin/" >> Dockerfile; docker build . --file Dockerfile --tag percona-toolkit:${{ github.sha }}
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.12.0
uses: aquasecurity/trivy-action@0.20.0
with:
image-ref: 'percona-toolkit:${{ github.sha }}'
format: 'table'
Expand All @@ -36,7 +36,7 @@ jobs:
vuln-type: 'os,library'
severity: 'CRITICAL,HIGH'
- name: Upload a Build Artifact
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4.3.3
with:
name: binaries
path: bin/*
15 changes: 15 additions & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ extend-exclude = [
"sandbox/sakila.sql",
"sandbox/sakila-db/",
"sandbox/servers/",
"src/go/pt-galera-log-explainer/tests/",
"src/go/pt-secure-collect/testdata/",
"util/NaturalDocs/",
"util/pod2rst-fixed.packed",
"go.mod",
# For now
"t/",
"**/*_test.go",
]
ignore-hidden = false

Expand All @@ -30,12 +33,15 @@ extend-ignore-re = [
]

[default.extend-identifiers]
"Bootstraping" = "Bootstraping" # typo in Galera lib
"Continuent" = "Continuent"
"END_ND_SUMMARY" = "END_ND_SUMMARY"
"END_ND_TOOLTIPS" = "END_ND_TOOLTIPS"
"EXPLAINed" = "EXPLAINed"
"FH_ND_FILE" = "FH_ND_FILE"
"INSERTs" = "INSERTs"
"IST" = "IST"
"istError" = "istError"
"JOINed" = "JOINed"
"MERCHANTIBILITY" = "MERCHANTIBILITY"
"ND" = "ND"
Expand All @@ -46,8 +52,17 @@ extend-ignore-re = [
"NDOnResize" = "NDOnResize"
"NULLable" = "NULLable"
"O_WRONLY" = "O_WRONLY"
"receving" = "receving" # typo in Galera lib
"RegexFailedToPrepareIST" = "RegexFailedToPrepareIST"
"RegexISTFailed" = "RegexISTFailed"
"RegexISTReceived" = "RegexISTReceived"
"RegexISTReceiver" = "RegexISTReceiver"
"RegexISTSender" = "RegexISTSender"
"RegexXtrabackupISTReceived" = "RegexXtrabackupISTReceived"
"START_ND_SUMMARY" = "START_ND_SUMMARY"
"START_ND_TOOLTIPS" = "START_ND_TOOLTIPS"
"thr" = "thr" # common abbreviation
"TOI" = "TOI"
"UNIONed" = "UNIONed"
"UNIONs" = "UNIONs"
"xtrabackup_ist" = "xtrabackup_ist"
44 changes: 44 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,49 @@
Changelog for Percona Toolkit

v3.5.7 released 2023-12-23

This is a HotFix release that does not have any public bug fix

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)
* 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-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-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"
* 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-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)

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)
* Feature PT-2258: Pass tbl as argument for on_copy_rows_after_nibble
* Feature PT-2168: PT-OSC shouldn't fail while unable to monitor a replica node
* Improvement PT-2156: Fix tests for lib
* Improvement: Fixed typos, removed trailing whitespaces, added spelling workflow to GitHub (Thanks to Viktor Szépe for the contributions)
* Fixed bug PT-2235: pt-mongodb-index-check does not support option --version
* Fixed bug PT-2236: pt-secure-collect, pt-pg-summary do not follow PT standard for option --version
* Fixed bug PT-2241: using --skip-check-slave-lag multiple times does not work as expected (Thanks to PinoCao for the contribution)
* Fixed bug PT-2246: CVE reported in Percona Toolkit version 3.5.4 related to Go (Thanks to Kushal Haldar for reporting this issue)
* Fixed bug PT-2248: pt-k8s-debug-collector does not run pg_gather with K8SPG 2

v3.5.4 released 2023-06-30

* Improvement PT-2151: Fix tests for pt-query-digest
Expand Down
26 changes: 22 additions & 4 deletions Makefile.PL
Original file line number Diff line number Diff line change
@@ -1,22 +1,40 @@
use ExtUtils::MakeMaker;
use ExtUtils::MY;

sub MY::postamble {
return <<'MAKE_GOTOOLS';
gotools:
cd src/go && $(MAKE) build
MAKE_GOTOOLS
}

WriteMakefile(
NAME => 'Percona::Toolkit',
VERSION => '3.5.4',
EXE_FILES => [ <bin/*> ],
VERSION => '3.5.7',
EXE_FILES => [
map {
(my $name = $_) =~ s/^bin.//;
my $file_name = $_;
if ( ( $file_name !~ m/mongo/ ) || ( $file_name !~ m/pg/ ) || ( $file_name !~ m/pt-stalk/ ) || ( $file_name !~ m/pt-k8s/ ) ) {
$_;
}
} <bin/*>
],
MAN1PODS => {
'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',
map {
(my $name = $_) =~ s/^bin.//;
my $file_name = $_;
if ( ( $file_name !~ m/mongo/ ) || ( $file_name !~ m/pg/ ) || ( $file_name !~ m/pt-stalk/ ) ) {
if ( ( $file_name !~ m/mongo/ ) || ( $file_name !~ m/pg/ ) || ( $file_name !~ m/pt-stalk/ ) || ( $file_name !~ m/pt-k8s/ ) ) {
$_ => "blib/man1/$name.1p";
}
} <bin/*>
},
MAN3PODS => {}, # man(3) pages are for C libs
depend => {manifypods => gotools},
PREREQ_PM => {
DBI => 1.46,
DBD::mysql => 3.0000_0,
},
);
);
4 changes: 2 additions & 2 deletions bin/pt-align
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ software from Percona.
=head1 COPYRIGHT, LICENSE, AND WARRANTY
This program is copyright 2011-2021 Percona LLC and/or its affiliates,
This program is copyright 2011-2024 Percona LLC and/or its affiliates,
2010-2011 Baron Schwartz.
THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
Expand All @@ -1364,6 +1364,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA.
=head1 VERSION
pt-align 3.5.4
pt-align 3.5.7
=cut
Loading

0 comments on commit bc23d08

Please sign in to comment.