Merge lp:~percona-dev/percona-server/5.1.57-fix_bug_784378 into lp:~percona-dev/percona-server/5.1.57

Proposed by Oleg Tsarev on 2011-05-26
Status: Merged
Approved by: Valentine Gostev on 2011-05-26
Approved revision: 228
Merged at revision: 229
Proposed branch: lp:~percona-dev/percona-server/5.1.57-fix_bug_784378
Merge into: lp:~percona-dev/percona-server/5.1.57
Diff against target: 50 lines (+6/-15)
2 files modified
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result (+2/-1)
mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test (+4/-14)
To merge this branch: bzr merge lp:~percona-dev/percona-server/5.1.57-fix_bug_784378
Reviewer Review Type Date Requested Status
Valentine Gostev (community) qa 2011-05-26 Approve on 2011-05-26
Percona developers 2011-05-26 Pending
Review via email: mp+62461@code.launchpad.net

This proposal supersedes a proposal from 2011-05-25.

Description of the change

Post-run check of test percona_slow_extended-slave_innodb_stats was failing because slave didn't stop sometimes.
I added "--source include/rpl_end.inc" to the end of the test and now test works fine.
Also I removed reconnect to server during query execution, because otherwise test failed in "--source include/rpl_end.inc".
For test enough just restart slave.
This fixes bug #784378

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

Oleg,

You can simply use "--source include/rpl_end.inc" which does STOP SLAVE, includes wait_for_slave_to_stop.inc and does a bunch of other things to make replication tests more robust.

review: Needs Fixing
Valentine Gostev (longbow) wrote :

ok for me

review: Approve (qa)

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-slave_innodb_stats.result'
2--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result 2011-02-26 09:03:28 +0000
3+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.result 2011-05-26 11:04:29 +0000
4@@ -15,6 +15,7 @@
5 START SLAVE;
6 include/wait_for_slave_to_start.inc
7 INSERT INTO t SELECT t.id,t.data from t;
8-DROP TABLE IF EXISTS t;
9 FLUSH LOGS;
10 4
11+DROP TABLE IF EXISTS t;
12+include/rpl_end.inc
13
14=== modified file 'mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test'
15--- mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test 2010-12-29 19:06:24 +0000
16+++ mysql-test/slow_extended.patch/percona_slow_extended-slave_innodb_stats.test 2011-05-26 11:04:29 +0000
17@@ -20,16 +20,6 @@
18 connection slave;
19 STOP SLAVE;
20 -- source include/wait_for_slave_to_stop.inc
21---write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
22-wait
23-EOF
24---shutdown_server 10
25---source include/wait_until_disconnected.inc
26---append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
27-restart
28-EOF
29---enable_reconnect
30---source include/wait_until_connected_again.inc
31 START SLAVE;
32 -- source include/wait_for_slave_to_start.inc
33
34@@ -37,12 +27,12 @@
35 INSERT INTO t SELECT t.id,t.data from t;
36 sync_slave_with_master;
37
38-connection master;
39-DROP TABLE IF EXISTS t;
40-sync_slave_with_master;
41-
42 connection slave;
43 FLUSH LOGS;
44 --let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log
45 --let grep_pattern = InnoDB_IO_r_ops
46 --source include/grep.inc
47+
48+connection master;
49+DROP TABLE IF EXISTS t;
50+--source include/rpl_end.inc

Subscribers

People subscribed via source and target branches