Skip to content

PMM-15195 Fixes and MySQL 9.7 changes. #1152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JiriCtvrtka wants to merge 11 commits into
base: 3.x
Choose a base branch
from
Open

PMM-15195 Fixes and MySQL 9.7 changes. #1152

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
82dc202
PMM-15195 Support MySQL 9.7 summaries
JiriCtvrtka Jul 17, 2026
ff936cd
PMM-15195 Keep mysqldump validation for summaries
JiriCtvrtka Jul 17, 2026
fec6780
Revert "PMM-15195 Keep mysqldump validation for summaries"
JiriCtvrtka Jul 17, 2026
65694d0
PMM-15195 Optional PMM Dump.
JiriCtvrtka Jul 18, 2026
fd5d7db
Merge remote-tracking branch 'origin/PMM-15195-mysql-97' into PMM-151…
JiriCtvrtka Jul 18, 2026
2f43aa6
PMM-15195 Bump Go to 1.26.5 to address CVE-2026-39822
JiriCtvrtka Jul 18, 2026
258d361
PMM-15195 Sync pt-mysql-summary modules.
JiriCtvrtka Jul 18, 2026
477a87b
PMM-15195 Improvements.
JiriCtvrtka Jul 24, 2026
e7bbf92
PMM-15195 Keep reporting a log size the server does expose.
JiriCtvrtka Jul 29, 2026
d5d2340
PMM-15195 Cover the redo log variable layouts that actually differ.
JiriCtvrtka Jul 29, 2026
f296151
PMM-15195 Document that the Log File Size rendering is version depend…
JiriCtvrtka Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions bin/pt-mysql-summary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2140,11 +2140,20 @@ section_innodb () {
name_val "File Per Table" $(get_var innodb_file_per_table "$variables_file")
name_val "Page Size" $(shorten $(get_var Innodb_page_size "$status_file") 0)

local log_size="$(get_var innodb_log_file_size "$variables_file")"
local log_file="$(get_var innodb_log_files_in_group "$variables_file")"
local log_total=$(awk "BEGIN {printf \"%.2f\n\", ${log_size}*${log_file}}" )
name_val "Log File Size" \
"${log_file} * $(shorten ${log_size} 1) = $(shorten ${log_total} 1)"
local redo_capacity="$(get_var innodb_redo_log_capacity "$variables_file")"
if [ -n "${redo_capacity}" ] && [ "${redo_capacity}" -gt 0 ] 2>/dev/null; then
name_val "Log File Size" "$(shorten ${redo_capacity} 1)"
else
local log_size="$(get_var innodb_log_file_size "$variables_file")"
local log_file="$(get_var innodb_log_files_in_group "$variables_file")"
if [ -n "${log_size}" ] && [ -n "${log_file}" ]; then
local log_total=$(awk "BEGIN {printf \"%.2f\n\", ${log_size}*${log_file}}" )
name_val "Log File Size" \
"${log_file} * $(shorten ${log_size} 1) = $(shorten ${log_total} 1)"
else
name_val "Log File Size" "Unknown"
fi
fi
name_val "Log Buffer Size" \
"$(shorten $(get_var innodb_log_buffer_size "$variables_file") 0)"
name_val "Flush Method" \
Expand Down Expand Up @@ -2729,13 +2738,15 @@ TOOL="pt-mysql-summary"
[ "$CMD_MYSQLDUMP" ] || CMD_MYSQLDUMP="$( _which mysqldump )"

check_mysql () {
# Check that mysql and mysqldump are in PATH. If not, we're
# already dead in the water, so don't bother with cmd line opts,
# just error and exit.
# mysql is always required for live collection.
[ -n "$(${CMD_MYSQL} --help 2>/dev/null)" ] \
|| die "Cannot execute mysql. Check that it is in PATH."
[ -n "$(${CMD_MYSQLDUMP} --help 2>/dev/null)" ] \
|| die "Cannot execute mysqldump. Check that it is in PATH."

# mysqldump is only used for the optional schema analysis.
if [ -n "$OPT_DATABASES" ] || [ -n "$OPT_ALL_DATABASES" ]; then
[ -n "$(${CMD_MYSQLDUMP} --help 2>/dev/null)" ] \
|| die "Cannot execute mysqldump. Check that it is in PATH."
fi

# Now that we have the cmd line opts, check that we can actually
# connect to MySQL.
Expand All @@ -2761,9 +2772,8 @@ main() {
local MYSQL_ARGS="$(mysql_options)"
EXT_ARGV="$(arrange_mysql_options "$EXT_ARGV $MYSQL_ARGS")"

# Check if mysql and mysqldump are there, otherwise bail out early.
# But don't if they passed in --read-samples, since we don't need
# a connection then.
# Check the required client programs, unless --read-samples was used
# and no live connection is needed.
[ "$OPT_READ_SAMPLES" ] || check_mysql

local RAN_WITH="--sleep=$OPT_SLEEP --databases=$OPT_DATABASES --save-samples=$OPT_SAVE_SAMPLES"
Expand Down
2 changes: 1 addition & 1 deletion config/scripts/pt_builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,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.26.2
GO_VERSION=1.26.5
if [ x"$ARCH" = "xx86_64" ]; then
GO_ARCH="amd64"
elif [ x"$ARCH" = "xaarch64" ]; then
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/percona/percona-toolkit

go 1.26.4
go 1.26.5

require (
github.com/AlekSi/pointer v1.2.0
Expand Down
21 changes: 16 additions & 5 deletions lib/bash/report_mysql_info.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,11 +1027,22 @@ section_innodb () {
name_val "File Per Table" $(get_var innodb_file_per_table "$variables_file")
name_val "Page Size" $(shorten $(get_var Innodb_page_size "$status_file") 0)

local log_size="$(get_var innodb_log_file_size "$variables_file")"
local log_file="$(get_var innodb_log_files_in_group "$variables_file")"
local log_total=$(awk "BEGIN {printf \"%.2f\n\", ${log_size}*${log_file}}" )
name_val "Log File Size" \
"${log_file} * $(shorten ${log_size} 1) = $(shorten ${log_total} 1)"
local redo_capacity="$(get_var innodb_redo_log_capacity "$variables_file")"
if [ -n "${redo_capacity}" ] && [ "${redo_capacity}" -gt 0 ] 2>/dev/null; then
# MySQL 8.0.30 and newer manage redo files dynamically and expose their
# total capacity instead of the legacy file size/count variables.
name_val "Log File Size" "$(shorten ${redo_capacity} 1)"
else
local log_size="$(get_var innodb_log_file_size "$variables_file")"
local log_file="$(get_var innodb_log_files_in_group "$variables_file")"
if [ -n "${log_size}" ] && [ -n "${log_file}" ]; then
local log_total=$(awk "BEGIN {printf \"%.2f\n\", ${log_size}*${log_file}}" )
name_val "Log File Size" \
"${log_file} * $(shorten ${log_size} 1) = $(shorten ${log_total} 1)"
else
name_val "Log File Size" "Unknown"
Comment on lines +1036 to +1048

@ademidoff ademidoff Jul 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requiring both log_size and log_file means a server that exposes only innodb_log_file_size now reports Unknown, discarding a value it actually has. Verified by driving section_innodb with innodb_log_files_in_group stripped and no innodb_redo_log_capacity present:

Log File Size | Unknown

That combination is MariaDB 10.5+, which dropped innodb_log_files_in_group and never had innodb_redo_log_capacity. The old code wasn't correct there either — it emitted a malformed * 92.0M = — so this isn't a clean regression, but it trades garbage for no information instead of for the number. Defaulting the multiplier costs one line:

Suggested change
local log_size="$(get_var innodb_log_file_size "$variables_file")"
local log_file="$(get_var innodb_log_files_in_group "$variables_file")"
if [ -n "${log_size}" ] && [ -n "${log_file}" ]; then
local log_total=$(awk "BEGIN {printf \"%.2f\n\", ${log_size}*${log_file}}" )
name_val "Log File Size" \
"${log_file} * $(shorten ${log_size} 1) = $(shorten ${log_total} 1)"
else
name_val "Log File Size" "Unknown"
local log_size="$(get_var innodb_log_file_size "$variables_file")"
local log_file="$(get_var innodb_log_files_in_group "$variables_file")"
if [ -n "${log_size}" ]; then
[ -n "${log_file}" ] || log_file=1
local log_total=$(awk "BEGIN {printf \"%.2f\n\", ${log_size}*${log_file}}" )
name_val "Log File Size" \
"${log_file} * $(shorten ${log_size} 1) = $(shorten ${log_total} 1)"
else
name_val "Log File Size" "Unknown"

Worth confirming whether MariaDB is in scope for pt-mysql-summary at all — there are no MariaDB samples under t/pt-mysql-summary/samples/, so CI wouldn't catch it either way.

fi
fi
name_val "Log Buffer Size" \
"$(shorten $(get_var innodb_log_buffer_size "$variables_file") 0)"
name_val "Flush Method" \
Expand Down
20 changes: 19 additions & 1 deletion t/lib/bash/report_mysql_info.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

plan 47
plan 48

. "$LIB_DIR/alt_cmds.sh"
. "$LIB_DIR/log_warn_die.sh"
Expand Down Expand Up @@ -681,6 +681,24 @@ EOF

test_format_innodb

test_format_innodb_redo_capacity () {
local NAME_VAL_LEN=25
cp "$samples/temp001/mysql-variables" "$PT_TMPDIR/mysql-variables-redo-capacity"
printf 'innodb_redo_log_capacity\t104857600\n' >> "$PT_TMPDIR/mysql-variables-redo-capacity"

@ademidoff ademidoff Jul 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This appends innodb_redo_log_capacity to a sample that still contains both legacy variables, so the test proves precedence — the MySQL 8.0.30 case where all three exist. It doesn't cover the MySQL 9.7 shape (redo capacity present, legacy variables gone), which is what the ticket is actually about. The Unknown branch is untested too.

I confirmed the 9.7 path renders correctly by hand, but nothing in CI would catch a regression in it. One extra case closes the gap:

grep -vE '^innodb_log_file_size|^innodb_log_files_in_group' \
   "$samples/temp001/mysql-variables" > "$PT_TMPDIR/mysql-variables-97"
printf 'innodb_redo_log_capacity\t104857600\n' >> "$PT_TMPDIR/mysql-variables-97"

(with plan 48 bumped accordingly)


cat <<EOF > $PT_TMPDIR/expected
Log File Size | 100.0M
EOF

section_innodb "$PT_TMPDIR/mysql-variables-redo-capacity" \
"$samples/temp001/mysql-status" \
| grep "Log File Size" > "$PT_TMPDIR/got"
no_diff "$PT_TMPDIR/got" "$PT_TMPDIR/expected" \
"Format InnoDB redo log capacity"
}

test_format_innodb_redo_capacity

# ###########################################################################
# format_innodb_filters
# ###########################################################################
Expand Down
35 changes: 35 additions & 0 deletions t/pt-mysql-summary/pt-mysql-summary.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,41 @@ ok(

undef($dir); # rm the dir because CLEANUP => 1

#
# mysqldump is optional without schema analysis
#

my $env_without_mysqldump = qq\CMD_MYSQL="$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysql" CMD_MYSQLDUMP="/nonexistent/mysqldump" LC_NUMERIC=POSIX\;
my $out_without_mysqldump = `$env_without_mysqldump $trunk/bin/$tool --sleep 1 -- --defaults-file=/tmp/12345/my.sandbox.cnf 2>&1`;
my $status_without_mysqldump = $CHILD_ERROR;

is(
$status_without_mysqldump,
0,
"mysqldump is not required without schema analysis"
);

unlike(
$out_without_mysqldump,
qr/Cannot execute mysqldump/,
"default summary does not report missing mysqldump"
);

my $schema_out_without_mysqldump = `$env_without_mysqldump $trunk/bin/$tool --sleep 1 --databases mysql -- --defaults-file=/tmp/12345/my.sandbox.cnf 2>&1`;
my $schema_status_without_mysqldump = $CHILD_ERROR;

isnt(
$schema_status_without_mysqldump,
0,
"mysqldump is required for schema analysis"
);

like(
$schema_out_without_mysqldump,
qr/Cannot execute mysqldump/,
"schema analysis reports missing mysqldump"
);

#
# --databases
#
Expand Down
2 changes: 1 addition & 1 deletion t/pt-mysql-summary/samples/expected_output_temp_enc008.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ Specify --databases or --all-databases to dump and summarize schemas
Buffer Pool Dirty | 10%
File Per Table | ON
Page Size | 16k
Log File Size | 2 * 5.0M = 10.0M
Log File Size | 100.0M
Log Buffer Size | 16M
Flush Method | fsync
Flush Log At Commit | 1
Expand Down
2 changes: 1 addition & 1 deletion t/pt-mysql-summary/samples/expected_output_temp_enc009.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ Specify --databases or --all-databases to dump and summarize schemas
Buffer Pool Dirty | 0%
File Per Table | ON
Page Size | 16k
Log File Size | 2 * 5.0M = 10.0M
Log File Size | 100.0M
Log Buffer Size | 16M
Flush Method | fsync
Flush Log At Commit | 1
Expand Down