database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

WL#4641, Bug#43828: fix for rpl_heartbeat_basic.test:

Browse Source 
The issue appears when number of heartbeat events non-zero before start of test
block. But really we need to check that no new events has received during test block.
So I did following:
1. Replace absolute values by diff of values
2. Increase heartbeat period from 1.5 to 5 sec
This commit is contained in:
Serge Kozlov
2009-10-07 19:44:01 +04:00
parent f02ec2b5a7
commit 3c98da71ae
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
View File

@ -220,15 +220,10 @@ BEGIN
UPDATE test.t1 SET a = a + 1 WHERE a < 10; UPDATE test.t1 SET a = a + 1 WHERE a < 10;
END| END|
RESET SLAVE; RESET SLAVE;
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=1.5; CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=5;
include/start_slave.inc include/start_slave.inc
SET @@global.event_scheduler=1; SET @@global.event_scheduler=1;
SHOW STATUS LIKE 'slave_received_heartbeats'; Number of received heartbeat events: 0
Variable_name Value
Slave_received_heartbeats 0
SHOW STATUS LIKE 'slave_received_heartbeats';
Variable_name Value
Slave_received_heartbeats 0
DELETE FROM t1; DELETE FROM t1;
DROP EVENT e1; DROP EVENT e1;

11
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
View File

@ -343,23 +343,28 @@ DELIMITER ;|
--connection slave --connection slave
RESET SLAVE; RESET SLAVE;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=1.5; eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=5;
--source include/start_slave.inc --source include/start_slave.inc
--connection master --connection master
# Enable scheduler # Enable scheduler
SET @@global.event_scheduler=1; SET @@global.event_scheduler=1;
--connection slave --connection slave
SHOW STATUS LIKE 'slave_received_heartbeats'; let $rcvd_heartbeats_before= query_get_value(SHOW STATUS LIKE 'slave_received_heartbeats', Value, 1);
--sync_with_master --sync_with_master
# Wait some updates for table t1 from master # Wait some updates for table t1 from master
let $wait_condition= SELECT COUNT(*)=1 FROM t1 WHERE a > 5; let $wait_condition= SELECT COUNT(*)=1 FROM t1 WHERE a > 5;
--source include/wait_condition.inc --source include/wait_condition.inc
SHOW STATUS LIKE 'slave_received_heartbeats'; let $rcvd_heartbeats_after= query_get_value(SHOW STATUS LIKE 'slave_received_heartbeats', Value, 1);
let $result= query_get_value(SELECT ($rcvd_heartbeats_after - $rcvd_heartbeats_before) > 0 AS Result, Result, 1);
--echo Number of received heartbeat events: $result
--connection master --connection master
DELETE FROM t1; DELETE FROM t1;
DROP EVENT e1; DROP EVENT e1;
--echo --echo
# Check received heartbeat events while logs flushed on slave # Check received heartbeat events while logs flushed on slave
--connection slave --connection slave
--echo *** Flush logs on slave *** --echo *** Flush logs on slave ***