Skip to content

M
MariaDB
Commit 9e845107 authored by Brandon Nesterenko's avatar Brandon Nesterenko Committed by Brandon Nesterenko
Browse files
Options

MDEV-34765: rpl.master_last_event_time_stmt fails with Result Length Mismatch 

When executing a Query_log_event that is a COMMIT query,
gtid_slave_pos is updated before other replication status
variables, so when an MTR test syncs a replica with
primaries via GTID, there is a slight window where accessing
status variables, e.g. via SHOW ALL SLAVES STATUS, results
in "stale" values because gtid_slave_pos has been updated
before the *_last_event_time fields have been updated.

This patch only fixes the test by switching from using
GTIDs to using binlog file coordinates when synchronizing
replicas with their primaries.
parent 492a7c24
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 21 deletions
mysql-test/suite/rpl/r/master_last_event_time_row.result
View file @ 9e845107
...@@ -54,9 +54,11 @@ include/wait_for_slave_param.inc [Exec_Master_Log_Pos] ...@@ -54,9 +54,11 @@ include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
# Test that changes are properly applied by server_2 and server_3 # Test that changes are properly applied by server_2 and server_3
# #
connection server_1; connection server_1;
include/save_master_gtid.inc include/save_master_pos.inc
connection server_2; connection server_2;
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
include/save_master_pos.inc
# Show that the server_2 received the insert from master # Show that the server_2 received the insert from master
select * from t1; select * from t1;
a a
...@@ -67,7 +69,8 @@ master_time == slave_time ; Should be 1 ...@@ -67,7 +69,8 @@ master_time == slave_time ; Should be 1
1 1
connection server_3; connection server_3;
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
# Show that the server_3 received the insert from master # Show that the server_3 received the insert from master
select * from t1; select * from t1;
a a
...@@ -87,9 +90,11 @@ insert into t1 values (1+sleep(3)); ...@@ -87,9 +90,11 @@ insert into t1 values (1+sleep(3));
# Test that changes are properly applied by server_2 and server_3 # Test that changes are properly applied by server_2 and server_3
# #
connection server_1; connection server_1;
include/save_master_gtid.inc include/save_master_pos.inc
connection server_2; connection server_2;
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
include/save_master_pos.inc
# Show that the server_2 received the insert from master # Show that the server_2 received the insert from master
select * from t1; select * from t1;
a a
...@@ -101,7 +106,8 @@ master_time == slave_time ; Should be 1 ...@@ -101,7 +106,8 @@ master_time == slave_time ; Should be 1
1 1
connection server_3; connection server_3;
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
# Show that the server_3 received the insert from master # Show that the server_3 received the insert from master
select * from t1; select * from t1;
a a
...@@ -123,9 +129,11 @@ SET TIMESTAMP=DEFAULT; ...@@ -123,9 +129,11 @@ SET TIMESTAMP=DEFAULT;
# Test that changes are properly applied by server_2 and server_3 # Test that changes are properly applied by server_2 and server_3
# #
connection server_1; connection server_1;
include/save_master_gtid.inc include/save_master_pos.inc
connection server_2; connection server_2;
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
include/save_master_pos.inc
# Show that the server_2 received the insert from master # Show that the server_2 received the insert from master
select * from t1; select * from t1;
a a
...@@ -138,7 +146,8 @@ master_time == slave_time ; Should be 1 ...@@ -138,7 +146,8 @@ master_time == slave_time ; Should be 1
1 1
connection server_3; connection server_3;
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
# Show that the server_3 received the insert from master # Show that the server_3 received the insert from master
select * from t1; select * from t1;
a a
...@@ -162,9 +171,11 @@ commit; ...@@ -162,9 +171,11 @@ commit;
# Test that changes are properly applied by server_2 and server_3 # Test that changes are properly applied by server_2 and server_3
# #
connection server_1; connection server_1;
include/save_master_gtid.inc include/save_master_pos.inc
connection server_2; connection server_2;
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
include/save_master_pos.inc
# Show that the server_2 received the insert from master # Show that the server_2 received the insert from master
select * from t1; select * from t1;
a a
...@@ -179,7 +190,8 @@ master_time == slave_time ; Should be 1 ...@@ -179,7 +190,8 @@ master_time == slave_time ; Should be 1
1 1
connection server_3; connection server_3;
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
# Show that the server_3 received the insert from master # Show that the server_3 received the insert from master
select * from t1; select * from t1;
a a
......
mysql-test/suite/rpl/r/master_last_event_time_stmt.result
View file @ 9e845107
...@@ -38,9 +38,11 @@ include/assert_grep.inc [Ensure serial slave doesn't overwrite exec_time in the ...@@ -38,9 +38,11 @@ include/assert_grep.inc [Ensure serial slave doesn't overwrite exec_time in the
# Test that changes are properly applied by server_2 and server_3 # Test that changes are properly applied by server_2 and server_3
# #
connection server_1; connection server_1;
include/save_master_gtid.inc include/save_master_pos.inc
connection server_2; connection server_2;
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
include/save_master_pos.inc
# Show that the server_2 received the insert from master # Show that the server_2 received the insert from master
select * from t1; select * from t1;
a a
...@@ -51,7 +53,8 @@ master_time == slave_time ; Should be 1 ...@@ -51,7 +53,8 @@ master_time == slave_time ; Should be 1
1 1
connection server_3; connection server_3;
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
# Show that the server_3 received the insert from master # Show that the server_3 received the insert from master
select * from t1; select * from t1;
a a
...@@ -86,9 +89,11 @@ include/assert_grep.inc [Ensure parallel slave doesn't overwrite exec_time in th ...@@ -86,9 +89,11 @@ include/assert_grep.inc [Ensure parallel slave doesn't overwrite exec_time in th
# Test that changes are properly applied by server_2 and server_3 # Test that changes are properly applied by server_2 and server_3
# #
connection server_1; connection server_1;
include/save_master_gtid.inc include/save_master_pos.inc
connection server_2; connection server_2;
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
include/save_master_pos.inc
# Show that the server_2 received the insert from master # Show that the server_2 received the insert from master
select * from t1; select * from t1;
a a
...@@ -100,7 +105,8 @@ master_time == slave_time ; Should be 1 ...@@ -100,7 +105,8 @@ master_time == slave_time ; Should be 1
1 1
connection server_3; connection server_3;
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/wait_for_slave_param.inc [Relay_Master_Log_File]
include/wait_for_slave_param.inc [Exec_Master_Log_Pos]
# Show that the server_3 received the insert from master # Show that the server_3 received the insert from master
select * from t1; select * from t1;
a a
......
mysql-test/suite/rpl/t/master_last_event_time.inc
View file @ 9e845107
...@@ -2,11 +2,21 @@ ...@@ -2,11 +2,21 @@
--echo # Test that changes are properly applied by server_2 and server_3 --echo # Test that changes are properly applied by server_2 and server_3
--echo # --echo #
# MDEV-34765: Slave to master synchronization must be done via binlog
# coordinates, as GTID with statement format would cause the sync_with_master
# points to continue too early due to the gtid_slave_pos update happening
# during the Query_log_event::do_apply_event(), which is before the
# *_last_event_time fields are updated.
--connection server_1 --connection server_1
--source include/save_master_gtid.inc --source include/save_master_pos.inc
--connection server_2 --connection server_2
--source include/sync_with_master_gtid.inc --source include/sync_with_master.inc
# binlog coordinate on server_2 differs from server_1's, so update the sync pos
# so server_3 can sync
--source include/save_master_pos.inc
--echo # Show that the server_2 received the insert from master --echo # Show that the server_2 received the insert from master
select * from t1; select * from t1;
...@@ -30,7 +40,7 @@ if (`SELECT NOT "$master_time" = "$slave_time"`) ...@@ -30,7 +40,7 @@ if (`SELECT NOT "$master_time" = "$slave_time"`)
--connection server_3 --connection server_3
--source include/start_slave.inc --source include/start_slave.inc
--source include/sync_with_master_gtid.inc --source include/sync_with_master.inc
--echo # Show that the server_3 received the insert from master --echo # Show that the server_3 received the insert from master
select * from t1; select * from t1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7