Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~tsarev/percona-server/5.5.12-794345 into lp:~percona-dev/percona-server/release-5.5.12-20.3

  1. 5.5.12-794345
  2. Merge into release-5.5.12-20.3
Proposed by Oleg Tsarev
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: no longer in the source branch.
Merged at revision: 118
Proposed branch: lp:~tsarev/percona-server/5.5.12-794345
Merge into: lp:~percona-dev/percona-server/release-5.5.12-20.3
Diff against target: 224 lines (+29/-11)
15 files modified
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test (+2/-2)
mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result (+2/-0)
mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test (+4/-0)
mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result (+2/-0)
mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test (+4/-0)
mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test (+2/-2)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt (+1/-1)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result (+2/-0)
mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test (+4/-0)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.5.12-794345
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Laurynas Biveinis code Pending
Alexey Kopytov Pending
Valentine Gostev qa Pending
Review via email: mp+63935@code.launchpad.net

This proposal supersedes a proposal from 2011-06-08.

Description of the change

Reason of bugs #786645 and #794345: when we run test under valgrind test work long time, and slow query log has extra query "call mtr.check_testcase();".
I disable slow query log on startup, and enable only when I need.
This is actual for tests:
 * percona_slow_extended-log_slow_filter
 * percona_slow_extended-long_query_time
 * percona_slow_extended-microseconds_in_slow_extended
 * percona_slow_extended-min_examined_row_limit
 * percona_slow_extended-use_global_long_query_time

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

You should be merging to release-5.5.12-20.3 rather than lp:percona-server which is a very outdated branch currently. Makes reviewing the diff impossible.

review: Needs Fixing
Revision history for this message
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal

Without this fix slow_query_log=ON on server start.
As result slow_query_log has unnecessary slow queries from mysql-test-run infrastructure and tests fails.
With this fix slow_query_log=OFF on server start, and I enable slow_query_log when start test features, and disable when stop.
As result tests work fine.

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

LGTM

review: Approve (code)
Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

1. slow_query_log is OFF by default, there's no need to add --slow_query_log=OFF to .opt
2. long_query_time can also be a session variable. Which means you can get rid of the .opt file altogether.
3. Note the "No newline at end of file" in percona_slow_extended-min_examined_row_limit-master.opt and percona_slow_extended-min_examined_row_limit-master.opt.
4. You can speed up the tests by orders of magnitude by simply setting long_query_time to 0 and avoiding SLEEP()s.

review: Needs Fixing
Revision history for this message
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal

1. If I don't add it - I has extra queries. Just as fact
2. Yes, should I move it to test?
3. Ok
4. Ok

Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

Yes, move long_query_time to test and remove the .opt files.

Revision history for this message
Oleg Tsarev (tsarev) wrote :

Alexey.

1. Without --slow_query_log=OFF and with --slow_query_log_file=file_name variable slow_query_log setuped to ON by mysqld (I check on upstream also)

2. I didn't move long_query_time to test because I should update the long_query_time in the end of test. Otherwise mysqld.check fails

3. Fixed

4. I can't do this, because long_query-time=0 log also queries like "set long_query_time=". This is bad for test understandable (I think clean log better for understanding than unclean but feater test)

Revision history for this message
Vadim Tkachenko (vadim-tk) wrote :

I am ok to merge it into 5.5.12, and fix further in 5.5.13 if needed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt'
2--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt 2011-01-16 14:55:00 +0000
3+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter-master.opt 2011-06-08 23:28:44 +0000
4@@ -1,1 +1,1 @@
5---slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1
6+--slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1 --slow_query_log=OFF
7
8=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result'
9--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result 2011-01-16 14:55:00 +0000
10+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.result 2011-06-08 23:28:44 +0000
11@@ -1,4 +1,3 @@
12-SET GLOBAL SLOW_QUERY_LOG=OFF;
13 drop table if exists t;
14 # Create test table
15 create table t(id INT PRIMARY KEY) engine=InnoDB;
16@@ -20,6 +19,7 @@
17 SELECT sleep(2);
18 sleep(2)
19 0
20+SET GLOBAL SLOW_QUERY_LOG=OFF;
21 drop table if exists t;
22 FLUSH LOGS;
23 2
24
25=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test'
26--- mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test 2011-01-16 14:55:00 +0000
27+++ mysql-test/slow_extended.patch/percona_slow_extended-log_slow_filter.test 2011-06-08 23:28:44 +0000
28@@ -1,7 +1,5 @@
29 source include/have_innodb.inc;
30
31-SET GLOBAL SLOW_QUERY_LOG=OFF;
32-
33 --disable_warnings
34 drop table if exists t;
35 --enable_warnings
36@@ -22,6 +20,8 @@
37 SELECT sleep(2) union select t2.id from t as t1,t as t2;
38 SELECT sleep(2);
39
40+SET GLOBAL SLOW_QUERY_LOG=OFF;
41+
42 --disable_warnings
43 drop table if exists t;
44 --enable_warnings
45
46=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt'
47--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt 2011-01-16 14:55:00 +0000
48+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time-master.opt 2011-06-08 23:28:44 +0000
49@@ -1,1 +1,1 @@
50---slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2
51+--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2 --slow-query-log=OFF
52
53=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result'
54--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result 2011-01-16 14:55:00 +0000
55+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.result 2011-06-08 23:28:44 +0000
56@@ -1,3 +1,4 @@
57+SET GLOBAL SLOW_QUERY_LOG=ON;
58 SELECT sleep(1);
59 sleep(1)
60 0
61@@ -18,5 +19,6 @@
62 sleep(5)
63 0
64 set long_query_time=2;
65+SET GLOBAL SLOW_QUERY_LOG=OFF;
66 FLUSH LOGS;
67 3
68
69=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test'
70--- mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test 2011-01-16 14:55:00 +0000
71+++ mysql-test/slow_extended.patch/percona_slow_extended-long_query_time.test 2011-06-08 23:28:44 +0000
72@@ -1,5 +1,7 @@
73 source include/have_innodb.inc;
74
75+SET GLOBAL SLOW_QUERY_LOG=ON;
76+
77 SELECT sleep(1);
78 SELECT sleep(3);
79 SELECT sleep(5);
80@@ -12,6 +14,8 @@
81
82 set long_query_time=2;
83
84+SET GLOBAL SLOW_QUERY_LOG=OFF;
85+
86 FLUSH LOGS;
87 --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log
88 --let grep_pattern = Query_time
89
90=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt'
91--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt 2011-01-16 14:55:00 +0000
92+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended-master.opt 2011-06-08 23:28:44 +0000
93@@ -1,1 +1,1 @@
94---slow-query-log-file=percona_slow_query_log-microseconds_in_slow_query_log.log --long-query-time=1
95+--slow-query-log-file=percona_slow_query_log-microseconds_in_slow_query_log.log --long-query-time=1 --slow_query_log=OFF
96
97=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result'
98--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result 2011-02-22 00:56:16 +0000
99+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.result 2011-06-08 23:28:44 +0000
100@@ -1,3 +1,4 @@
101+SET GLOBAL SLOW_QUERY_LOG=ON;
102 SELECT sleep(2);
103 sleep(2)
104 0
105@@ -6,6 +7,7 @@
106 sleep(2)
107 0
108 set global slow_query_log_timestamp_precision='second';
109+SET GLOBAL SLOW_QUERY_LOG=OFF;
110 FLUSH LOGS;
111 1
112 2
113
114=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test'
115--- mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test 2011-02-22 00:56:16 +0000
116+++ mysql-test/slow_extended.patch/percona_slow_extended-microseconds_in_slow_extended.test 2011-06-08 23:28:44 +0000
117@@ -1,5 +1,7 @@
118 source include/have_innodb.inc;
119
120+SET GLOBAL SLOW_QUERY_LOG=ON;
121+
122 SELECT sleep(2);
123
124 set global slow_query_log_timestamp_precision='microsecond';
125@@ -8,6 +10,8 @@
126
127 set global slow_query_log_timestamp_precision='second';
128
129+SET GLOBAL SLOW_QUERY_LOG=OFF;
130+
131 FLUSH LOGS;
132 --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log
133 --let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
134
135=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt'
136--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt 2011-01-16 14:55:00 +0000
137+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit-master.opt 2011-06-08 23:28:44 +0000
138@@ -1,1 +1,1 @@
139---slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1
140+--slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1 --slow-query-log=OFF
141
142=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result'
143--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result 2011-01-16 14:55:00 +0000
144+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.result 2011-06-08 23:28:44 +0000
145@@ -1,4 +1,3 @@
146-SET GLOBAL SLOW_QUERY_LOG=OFF;
147 drop table if exists t;
148 # Create test table
149 create table t(id INT PRIMARY KEY) engine=InnoDB;
150@@ -20,6 +19,7 @@
151 SELECT sleep(2);
152 sleep(2)
153 0
154+SET GLOBAL SLOW_QUERY_LOG=OFF;
155 drop table if exists t;
156 FLUSH LOGS;
157 2
158
159=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test'
160--- mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test 2011-01-16 14:55:00 +0000
161+++ mysql-test/slow_extended.patch/percona_slow_extended-min_examined_row_limit.test 2011-06-08 23:28:44 +0000
162@@ -1,7 +1,5 @@
163 source include/have_innodb.inc;
164
165-SET GLOBAL SLOW_QUERY_LOG=OFF;
166-
167 --disable_warnings
168 drop table if exists t;
169 --enable_warnings
170@@ -22,6 +20,8 @@
171 SELECT sleep(2) union select t2.id from t as t1,t as t2;
172 SELECT sleep(2);
173
174+SET GLOBAL SLOW_QUERY_LOG=OFF;
175+
176 --disable_warnings
177 drop table if exists t;
178 --enable_warnings
179
180=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt'
181--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt 2011-02-21 13:56:22 +0000
182+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time-master.opt 2011-06-08 23:28:44 +0000
183@@ -1,1 +1,1 @@
184---slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2 --slow_query_log_use_global_control=long_query_time
185\ No newline at end of file
186+--slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2 --slow_query_log_use_global_control=long_query_time --slow-query-log=OFF
187
188=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result'
189--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result 2011-02-21 13:56:22 +0000
190+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.result 2011-06-08 23:28:44 +0000
191@@ -1,3 +1,4 @@
192+SET GLOBAL SLOW_QUERY_LOG=ON;
193 SELECT sleep(1);
194 sleep(1)
195 0
196@@ -20,6 +21,7 @@
197 0
198 set global long_query_time=2;
199 set global slow_query_log_use_global_control='';
200+SET GLOBAL SLOW_QUERY_LOG=OFF;
201 FLUSH LOGS;
202 3
203 show global variables like 'slow_query_log_use_global_control';
204
205=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test'
206--- mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test 2011-02-21 13:56:22 +0000
207+++ mysql-test/slow_extended.patch/percona_slow_extended-use_global_long_query_time.test 2011-06-08 23:28:44 +0000
208@@ -1,5 +1,7 @@
209 source include/have_innodb.inc;
210
211+SET GLOBAL SLOW_QUERY_LOG=ON;
212+
213 SELECT sleep(1);
214 SELECT sleep(3);
215 SELECT sleep(5);
216@@ -14,6 +16,8 @@
217 set global long_query_time=2;
218 set global slow_query_log_use_global_control='';
219
220+SET GLOBAL SLOW_QUERY_LOG=OFF;
221+
222 FLUSH LOGS;
223 --let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log
224 --let grep_pattern = Query_time

Subscribers

People subscribed via source and target branches