Skip to content

Commit fb13616

Browse files
knielsenknielsen
committed
MDEV-7145: Delayed replication.
Add test cases for delayed slave with parallel replication. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
1 parent 3011060 commit fb13616

File tree

6 files changed

+154
-3
lines changed

6 files changed

+154
-3
lines changed

‎mysql-test/suite/rpl/r/rpl_delayed_slave,parallel.rdiff

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--- mysql-test/suite/rpl/r/rpl_delayed_slave.result 2016-10-14 21:14:02.338075590 +0200
2+
+++ mysql-test/suite/rpl/r/rpl_delayed_slave,parallel.reject 2016-10-14 21:17:51.296986686 +0200
3+
@@ -45,7 +45,6 @@
4+
# wait for first query to execute
5+
# sleep 1*T
6+
# Asserted this: Second query executed
7+
-# Asserted this: Status should be executing third query (i.e., 'User sleep')
8+
# sleep 2*T
9+
# Asserted this: Third query executed
10+
# Asserted this: Status should be 'Has read all relay log...'
11+
@@ -167,5 +166,5 @@
12+
conservative
13+
SELECT @@GLOBAL.slave_parallel_threads;
14+
@@GLOBAL.slave_parallel_threads
15+
-0
16+
+10
17+
include/rpl_end.inc

‎mysql-test/suite/rpl/r/rpl_delayed_slave.result

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,10 @@ include/start_slave.inc
162162
DROP TABLE t1, t_check_dml_not_executed_prematurely;
163163
DROP FUNCTION delay_on_slave;
164164
[on slave]
165+
SELECT @@GLOBAL.slave_parallel_mode;
166+
@@GLOBAL.slave_parallel_mode
167+
conservative
168+
SELECT @@GLOBAL.slave_parallel_threads;
169+
@@GLOBAL.slave_parallel_threads
170+
0
165171
include/rpl_end.inc

‎mysql-test/suite/rpl/r/rpl_delayed_slave2.result

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
include/master-slave.inc
2+
[connection master]
3+
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
4+
CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(100));
5+
INSERT INTO t1 VALUES (1, "a");
6+
include/stop_slave.inc
7+
CHANGE MASTER TO master_use_gtid=slave_pos;
8+
SET @old_mode= @@GLOBAL.slave_parallel_mode;
9+
SET GLOBAL slave_parallel_mode=optimistic;
10+
SET @old_threads= @@GLOBAL.slave_parallel_threads;
11+
SET GLOBAL slave_parallel_threads=10;
12+
INSERT INTO t1 VALUES (2, "b");
13+
INSERT INTO t1 VALUES (3, "b");
14+
INSERT INTO t1 VALUES (4, "b");
15+
SET timestamp= @@timestamp + 24*60*60;
16+
INSERT INTO t1 VALUES (5, "c");
17+
INSERT INTO t1 VALUES (6, "c");
18+
SET timestamp= 0;
19+
include/save_master_gtid.inc
20+
CHANGE MASTER TO master_delay=1;
21+
include/start_slave.inc
22+
SELECT MASTER_GTID_WAIT('GTID1');
23+
MASTER_GTID_WAIT('GTID1')
24+
0
25+
SELECT MASTER_GTID_WAIT('GTID2', 2);
26+
MASTER_GTID_WAIT('GTID2', 2)
27+
-1
28+
include/stop_slave.inc
29+
SELECT * FROM t1 ORDER BY a;
30+
a b
31+
1 a
32+
2 b
33+
3 b
34+
4 b
35+
CHANGE MASTER TO master_delay=0;
36+
include/start_slave.inc
37+
include/sync_with_master_gtid.inc
38+
SELECT * FROM t1 ORDER BY a;
39+
a b
40+
1 a
41+
2 b
42+
3 b
43+
4 b
44+
5 c
45+
6 c
46+
include/stop_slave.inc
47+
CHANGE MASTER TO master_use_gtid=no, master_delay=0;
48+
SET GLOBAL slave_parallel_mode=@old_mode;
49+
SET GLOBAL slave_parallel_threads=@old_threads;
50+
include/start_slave.inc
51+
DROP TABLE t1;
52+
include/rpl_end.inc

‎mysql-test/suite/rpl/t/rpl_delayed_slave.combinations

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[nonparallel]
2+
3+
[parallel]
4+
--slave-parallel-mode=conservative
5+
--slave-parallel-threads=10

‎mysql-test/suite/rpl/t/rpl_delayed_slave.test

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,13 @@ INSERT INTO t1 SELECT delay_on_slave(2), 4;
151151
--let $assert_cond= MAX(b) = 3 FROM t1
152152
--source include/rpl_assert.inc
153153

154-
--let $assert_text= Status should be executing third query (i.e., 'User sleep')
155-
--let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" = "User sleep"
156-
--source include/rpl_assert.inc
154+
let $parallel= `SELECT @@GLOBAL.slave_parallel_threads`;
155+
if (!$parallel)
156+
{
157+
let $assert_text= Status should be executing third query (i.e., 'User sleep');
158+
let $assert_cond= "[SHOW SLAVE STATUS, Slave_SQL_Running_State, 1]" = "User sleep";
159+
source include/rpl_assert.inc;
160+
}
157161

158162
--echo # sleep 2*T
159163
--sleep $time2
@@ -414,5 +418,7 @@ DROP FUNCTION delay_on_slave;
414418

415419
--echo [on slave]
416420
--sync_slave_with_master
421+
SELECT @@GLOBAL.slave_parallel_mode;
422+
SELECT @@GLOBAL.slave_parallel_threads;
417423

418424
--source include/rpl_end.inc

‎mysql-test/suite/rpl/t/rpl_delayed_slave2.test

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
--source include/have_innodb.inc
2+
--source include/master-slave.inc
3+
4+
# This test file tests delayed slave for parallel replication (and GTID).
5+
# Uses a different approach from rpl_delayed_slave.test, setting @@timestamp
6+
# to simulate events logged on master at different times.
7+
8+
--connection master
9+
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
10+
CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(100));
11+
INSERT INTO t1 VALUES (1, "a");
12+
--save_master_pos
13+
14+
--connection slave
15+
--sync_with_master
16+
--source include/stop_slave.inc
17+
CHANGE MASTER TO master_use_gtid=slave_pos;
18+
SET @old_mode= @@GLOBAL.slave_parallel_mode;
19+
SET GLOBAL slave_parallel_mode=optimistic;
20+
SET @old_threads= @@GLOBAL.slave_parallel_threads;
21+
SET GLOBAL slave_parallel_threads=10;
22+
23+
--connection master
24+
INSERT INTO t1 VALUES (2, "b");
25+
INSERT INTO t1 VALUES (3, "b");
26+
INSERT INTO t1 VALUES (4, "b");
27+
--let $gtid1= `SELECT @@gtid_binlog_pos`
28+
# Simulate an event a days in the future, for delayed slave to wait on.
29+
SET timestamp= @@timestamp + 24*60*60;
30+
INSERT INTO t1 VALUES (5, "c");
31+
INSERT INTO t1 VALUES (6, "c");
32+
SET timestamp= 0;
33+
--let $gtid2= `SELECT @@gtid_binlog_pos`
34+
--source include/save_master_gtid.inc
35+
36+
--connection slave
37+
CHANGE MASTER TO master_delay=1;
38+
--source include/start_slave.inc
39+
--replace_result $gtid1 GTID1
40+
# First sync halfways, to avoid timing-dependent test failures.
41+
eval SELECT MASTER_GTID_WAIT('$gtid1');
42+
# Try to sync up, should timeout because slave is waiting for one day.
43+
--replace_result $gtid2 GTID2
44+
eval SELECT MASTER_GTID_WAIT('$gtid2', 2);
45+
46+
# Check that we can stop slave while delaying.
47+
--source include/stop_slave.inc
48+
SELECT * FROM t1 ORDER BY a;
49+
CHANGE MASTER TO master_delay=0;
50+
--source include/start_slave.inc
51+
--source include/sync_with_master_gtid.inc
52+
SELECT * FROM t1 ORDER BY a;
53+
54+
55+
--connection slave
56+
--source include/stop_slave.inc
57+
CHANGE MASTER TO master_use_gtid=no, master_delay=0;
58+
SET GLOBAL slave_parallel_mode=@old_mode;
59+
SET GLOBAL slave_parallel_threads=@old_threads;
60+
--source include/start_slave.inc
61+
62+
--connection master
63+
DROP TABLE t1;
64+
65+
--source include/rpl_end.inc

0 commit comments

Comments
 (0)