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

Collect INNODB_TRX, INNODB_LOCKS, and INNODB_LOCK_WAITS. Fix update-module so it works again with Bash tools.

Browse Source
This commit is contained in:
Daniel Nichter
2012-08-30 15:40:09 -06:00
parent e5a7db8ea2
commit e1bd108aa4
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/pt-stalk
View File

@@ -811,6 +811,7 @@ collect() {
if [ "$have_lock_waits_table" ]; then 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 fi
done done
log "Loop end: $(date +'TS %s.%N %F %T')" log "Loop end: $(date +'TS %s.%N %F %T')"
@@ -911,6 +912,12 @@ lock_waits() {
$CMD_MYSQL $EXT_ARGV -e "$sql2" $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 # End collect package
# ########################################################################### # ###########################################################################

7
lib/bash/collect.sh
View File

@@ -228,6 +228,7 @@ collect() {
if [ "$have_lock_waits_table" ]; then 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 fi
done done
log "Loop end: $(date +'TS %s.%N %F %T')" log "Loop end: $(date +'TS %s.%N %F %T')"
@@ -338,6 +339,12 @@ lock_waits() {
$CMD_MYSQL $EXT_ARGV -e "$sql2" $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 # End collect package
# ########################################################################### # ###########################################################################

5
util/update-modules
View File

@@ -182,10 +182,13 @@ for pkg in $pkgs; do
done done
if [ $pkgs_updated -gt 0 ]; then if [ $pkgs_updated -gt 0 ]; then
if [ "$tool_lang" = "perl" ]; then
update_tool_header $tmp_tool_file update_tool_header $tmp_tool_file
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
warn "Failed to update tool header" warn "Failed to update tool header"
else fi
fi
if [ $EXIT_STATUS -eq 0 ]; then
cp $tmp_tool_file $tool_file cp $tmp_tool_file $tool_file
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
warn "Failed to copy $tmp_tool_file to $tool_file" warn "Failed to copy $tmp_tool_file to $tool_file"