percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR-839 - Update pt-mysql-summary

Browse Source 
- Reversed condition, so default is transaction_isolation, not
  tx_isolation
- Removed extra variable: we have variable $version, defined before
- Fixed test cases
This commit is contained in:
Sveta Smirnova
2024-07-16 19:02:40 +03:00
parent 2e643e5948
commit f47c1d76b6
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/pt-mysql-summary
View File

@@ -2096,10 +2096,9 @@ section_innodb () {
local bp_dirt="$(get_var Innodb_buffer_pool_pages_dirty "$status_file")" local bp_dirt="$(get_var Innodb_buffer_pool_pages_dirty "$status_file")"
local bp_fill=$((${bp_pags} - ${bp_free})) local bp_fill=$((${bp_pags} - ${bp_free}))
local mysql_version=$(get_var version "$variables_file" | awk -F'-' '{print $1}') local transaction_isolation_var="transaction_isolation"
local transaction_isolation_var="tx_isolation" if [ "$version" '<' "5.7.20" ]; then # false if version >= 5.7.20
if [ "$mysql_version" '>' "5.7.19" ]; then # true if version >= 5.7.20 transaction_isolation_var="tx_isolation"
transaction_isolation_var="transaction_isolation"
fi fi
name_val "Buffer Pool Fill" "$(fuzzy_pct ${bp_fill} ${bp_pags})" name_val "Buffer Pool Fill" "$(fuzzy_pct ${bp_fill} ${bp_pags})"

7
lib/bash/report_mysql_info.sh
View File

@@ -1016,10 +1016,9 @@ section_innodb () {
local bp_fill=$((${bp_pags} - ${bp_free})) local bp_fill=$((${bp_pags} - ${bp_free}))
# dynamically allocate variable name - transaction_isolation # dynamically allocate variable name - transaction_isolation
local mysql_version=$(get_var version "$variables_file" | awk -F'-' '{print $1}') local transaction_isolation_var="transaction_isolation"
local transaction_isolation_var="tx_isolation" if [ "$version" '<' "5.7.20" ]; then # false if version >= 5.7.20
if [ "$mysql_version" '>' "5.7.19" ]; then # true if version >= 5.7.20 transaction_isolation_var="tx_isolation"
transaction_isolation_var="transaction_isolation"
fi fi
name_val "Buffer Pool Fill" "$(fuzzy_pct ${bp_fill} ${bp_pags})" name_val "Buffer Pool Fill" "$(fuzzy_pct ${bp_fill} ${bp_pags})"

2
t/pt-mysql-summary/samples/expected_output_temp_enc008.txt
View File

@@ -259,7 +259,7 @@ Specify --databases or --all-databases to dump and summarize schemas
Thread Concurrency | 0 Thread Concurrency | 0
Concurrency Tickets | 5000 Concurrency Tickets | 5000
Commit Concurrency | 0 Commit Concurrency | 0
Txn Isolation Level | Txn Isolation Level | REPEATABLE-READ
Adaptive Flushing | ON Adaptive Flushing | ON
Adaptive Checkpoint | Adaptive Checkpoint |
Checkpoint Age | 69k Checkpoint Age | 69k

2
t/pt-mysql-summary/samples/expected_output_temp_enc009.txt
View File

@@ -264,7 +264,7 @@ Specify --databases or --all-databases to dump and summarize schemas
Thread Concurrency | 0 Thread Concurrency | 0
Concurrency Tickets | 5000 Concurrency Tickets | 5000
Commit Concurrency | 0 Commit Concurrency | 0
Txn Isolation Level | Txn Isolation Level | REPEATABLE-READ
Adaptive Flushing | ON Adaptive Flushing | ON
Adaptive Checkpoint | Adaptive Checkpoint |
Checkpoint Age | 0 Checkpoint Age | 0