database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-4632 multi_source.status_vars test fails sporadically in buildbot

Browse Source 
`Slave_received_heartbeats`’s test for independence between
connections relied on timing with second-level precision,
which is inconsistent on a loaded CI.
To avoid relying on timing accuracy, this commit changes the test
strategy to measure a live result and use that to show independence.
This commit is contained in:
ParadoxV5
2026-10-04 16:46:14 -06:00
parent 19719d64f0
commit 890cc63478
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/multi_source/status_vars.result
View File

@@ -52,9 +52,7 @@ Variable_name Value
Slave_received_heartbeats 0
start slave;
include/wait_for_slave_to_start.inc
show status like 'Slave_received_heartbeats';
Variable_name Value
Slave_received_heartbeats 2
include/wait_for_status_var.inc
stop slave;
include/wait_for_slave_to_stop.inc
set default_master_connection = 'master1';
@@ -63,16 +61,17 @@ Variable_name Value
Slave_received_heartbeats 0
stop slave;
include/wait_for_slave_to_stop.inc
change master to master_heartbeat_period=2;
change master to master_heartbeat_period=1;
start slave;
include/wait_for_slave_to_start.inc
include/wait_for_status_var.inc
set default_master_connection = '';
show status like 'Slave_received_heartbeats';
Variable_name Value
Slave_received_heartbeats 1
Slave_received_heartbeats #status_var_value
#
# Slave_open_temp_tables should be global
#
set default_master_connection = '';
start slave;
include/wait_for_slave_to_start.inc
connect master1,127.0.0.1,root,,,$SERVER_MYPORT_1;

20
mysql-test/suite/multi_source/status_vars.test
View File

@@ -68,27 +68,32 @@ start slave;
--source include/wait_for_slave_to_start.inc
--let $status_var = Slave_received_heartbeats
--let $status_var_value = 2
# The units are tens of seconds
--let $status_timeout = 30
--let $status_var_value = 0
--let $status_var_comparsion= >
# The units are tenths of seconds
--let $status_timeout = 50
--echo include/wait_for_status_var.inc
--source include/wait_for_status_var.inc
show status like 'Slave_received_heartbeats';
stop slave;
--source include/wait_for_slave_to_stop.inc
let $status_var_value=
query_get_value("show status like 'Slave_received_heartbeats'", Value, 1);
set default_master_connection = 'master1';
show status like 'Slave_received_heartbeats';
stop slave;
--source include/wait_for_slave_to_stop.inc
change master to master_heartbeat_period=2;
change master to master_heartbeat_period=1;
start slave;
--source include/wait_for_slave_to_start.inc
--let $status_var = Slave_received_heartbeats
--let $status_var_value = 1
--let $status_timeout = 30
--echo include/wait_for_status_var.inc
--source include/wait_for_status_var.inc
set default_master_connection = '';
--replace_result $status_var_value #status_var_value
show status like 'Slave_received_heartbeats';
@@ -96,7 +101,6 @@ show status like 'Slave_received_heartbeats';
--echo # Slave_open_temp_tables should be global
--echo #
set default_master_connection = '';
start slave;
--source include/wait_for_slave_to_start.inc