mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-10 13:11:32 +00:00
Collect INNODB_TRX, INNODB_LOCKS, and INNODB_LOCK_WAITS. Fix update-module so it works again with Bash tools.
This commit is contained in:
@@ -810,7 +810,8 @@ collect() {
|
||||
>> "$d/$p-processlist" &
|
||||
|
||||
if [ "$have_lock_waits_table" ]; then
|
||||
(echo $ts; lock_waits) >>"$d/$p-lock-waits" &
|
||||
(echo $ts; lock_waits) >>"$d/$p-lock-waits" &
|
||||
(echo $ts; transactions) >>"$d/$p-transactions" &
|
||||
fi
|
||||
done
|
||||
log "Loop end: $(date +'TS %s.%N %F %T')"
|
||||
@@ -911,6 +912,12 @@ lock_waits() {
|
||||
$CMD_MYSQL $EXT_ARGV -e "$sql2"
|
||||
}
|
||||
|
||||
transactions() {
|
||||
$CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX\G"
|
||||
$CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS\G"
|
||||
$CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G"
|
||||
}
|
||||
|
||||
# ###########################################################################
|
||||
# End collect package
|
||||
# ###########################################################################
|
||||
|
@@ -227,7 +227,8 @@ collect() {
|
||||
>> "$d/$p-processlist" &
|
||||
|
||||
if [ "$have_lock_waits_table" ]; then
|
||||
(echo $ts; lock_waits) >>"$d/$p-lock-waits" &
|
||||
(echo $ts; lock_waits) >>"$d/$p-lock-waits" &
|
||||
(echo $ts; transactions) >>"$d/$p-transactions" &
|
||||
fi
|
||||
done
|
||||
log "Loop end: $(date +'TS %s.%N %F %T')"
|
||||
@@ -338,6 +339,12 @@ lock_waits() {
|
||||
$CMD_MYSQL $EXT_ARGV -e "$sql2"
|
||||
}
|
||||
|
||||
transactions() {
|
||||
$CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX\G"
|
||||
$CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS\G"
|
||||
$CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G"
|
||||
}
|
||||
|
||||
# ###########################################################################
|
||||
# End collect package
|
||||
# ###########################################################################
|
||||
|
@@ -182,10 +182,13 @@ for pkg in $pkgs; do
|
||||
done
|
||||
|
||||
if [ $pkgs_updated -gt 0 ]; then
|
||||
update_tool_header $tmp_tool_file
|
||||
if [ $? -ne 0 ]; then
|
||||
warn "Failed to update tool header"
|
||||
else
|
||||
if [ "$tool_lang" = "perl" ]; then
|
||||
update_tool_header $tmp_tool_file
|
||||
if [ $? -ne 0 ]; then
|
||||
warn "Failed to update tool header"
|
||||
fi
|
||||
fi
|
||||
if [ $EXIT_STATUS -eq 0 ]; then
|
||||
cp $tmp_tool_file $tool_file
|
||||
if [ $? -ne 0 ]; then
|
||||
warn "Failed to copy $tmp_tool_file to $tool_file"
|
||||
|
Reference in New Issue
Block a user