Percona Toolkit moved to https://jira.percona.com/projects/PT

Merge lp:~percona-toolkit-dev/percona-toolkit/collect-all-innodb-lock-data into lp:percona-toolkit/2.1

  1. collect-all-innodb-lock-data
  2. Merge into 2.1
Proposed by Daniel Nichter
Status: Merged
Approved by: Daniel Nichter
Approved revision: 388
Merged at revision: 391
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/collect-all-innodb-lock-data
Merge into: lp:percona-toolkit/2.1
Diff against target: 75 lines (+23/-6)
3 files modified
bin/pt-stalk (+8/-1)
lib/bash/collect.sh (+8/-1)
util/update-modules (+7/-4)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/collect-all-innodb-lock-data
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+122158@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-stalk'
2--- bin/pt-stalk 2012-08-29 01:05:33 +0000
3+++ bin/pt-stalk 2012-08-30 21:45:40 +0000
4@@ -810,7 +810,8 @@
5 >> "$d/$p-processlist" &
6
7 if [ "$have_lock_waits_table" ]; then
8- (echo $ts; lock_waits) >>"$d/$p-lock-waits" &
9+ (echo $ts; lock_waits) >>"$d/$p-lock-waits" &
10+ (echo $ts; transactions) >>"$d/$p-transactions" &
11 fi
12 done
13 log "Loop end: $(date +'TS %s.%N %F %T')"
14@@ -911,6 +912,12 @@
15 $CMD_MYSQL $EXT_ARGV -e "$sql2"
16 }
17
18+transactions() {
19+ $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX\G"
20+ $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS\G"
21+ $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G"
22+}
23+
24 # ###########################################################################
25 # End collect package
26 # ###########################################################################
27
28=== modified file 'lib/bash/collect.sh'
29--- lib/bash/collect.sh 2012-08-14 15:11:41 +0000
30+++ lib/bash/collect.sh 2012-08-30 21:45:40 +0000
31@@ -227,7 +227,8 @@
32 >> "$d/$p-processlist" &
33
34 if [ "$have_lock_waits_table" ]; then
35- (echo $ts; lock_waits) >>"$d/$p-lock-waits" &
36+ (echo $ts; lock_waits) >>"$d/$p-lock-waits" &
37+ (echo $ts; transactions) >>"$d/$p-transactions" &
38 fi
39 done
40 log "Loop end: $(date +'TS %s.%N %F %T')"
41@@ -338,6 +339,12 @@
42 $CMD_MYSQL $EXT_ARGV -e "$sql2"
43 }
44
45+transactions() {
46+ $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX\G"
47+ $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCKS\G"
48+ $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G"
49+}
50+
51 # ###########################################################################
52 # End collect package
53 # ###########################################################################
54
55=== modified file 'util/update-modules'
56--- util/update-modules 2012-08-21 22:15:44 +0000
57+++ util/update-modules 2012-08-30 21:45:40 +0000
58@@ -182,10 +182,13 @@
59 done
60
61 if [ $pkgs_updated -gt 0 ]; then
62- update_tool_header $tmp_tool_file
63- if [ $? -ne 0 ]; then
64- warn "Failed to update tool header"
65- else
66+ if [ "$tool_lang" = "perl" ]; then
67+ update_tool_header $tmp_tool_file
68+ if [ $? -ne 0 ]; then
69+ warn "Failed to update tool header"
70+ fi
71+ fi
72+ if [ $EXIT_STATUS -eq 0 ]; then
73 cp $tmp_tool_file $tool_file
74 if [ $? -ne 0 ]; then
75 warn "Failed to copy $tmp_tool_file to $tool_file"

Subscribers

People subscribed via source and target branches