mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-30232: Increase timeouts to fix sporadic fails

Browse source
This commit is contained in:
Angelique 2023-05-12 22:30:47 +00:00
parent 8810b1ecf1
commit 996b040f93
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/suite/rpl/r/rpl_gtid_crash.result
View file

@ -168,7 +168,7 @@ SELECT * from t1 WHERE a > 10 ORDER BY a;
a a
gtid_check gtid_check
Binlog pos ok Binlog pos ok
# Wait 30 seconds for SQL thread to catch up with IO thread # Wait 60 seconds for SQL thread to catch up with IO thread
connection server_2; connection server_2;
SELECT * from t1 WHERE a > 10 ORDER BY a; SELECT * from t1 WHERE a > 10 ORDER BY a;
a a
@ -224,7 +224,7 @@ gtid_check
Binlog pos ok Binlog pos ok
gtid_check gtid_check
Current pos ok Current pos ok
# Wait 30 seconds for SQL thread to catch up with IO thread # Wait 60 seconds for SQL thread to catch up with IO thread
connection server_2; connection server_2;
SELECT * from t1 WHERE a > 10 ORDER BY a; SELECT * from t1 WHERE a > 10 ORDER BY a;
a a
@ -275,7 +275,7 @@ COMMIT;
Got one of the listed errors Got one of the listed errors
connection server_1; connection server_1;
connection server_2; connection server_2;
# Wait 30 seconds for IO thread to connect and SQL thread to catch up # Wait 60 seconds for IO thread to connect and SQL thread to catch up
# with IO thread. # with IO thread.
include/stop_slave.inc include/stop_slave.inc
connection server_1; connection server_1;

12
mysql-test/suite/rpl/t/rpl_gtid_crash.test
View file

@ -345,9 +345,9 @@ SELECT * from t1 WHERE a > 10 ORDER BY a;
eval SELECT IF(INSTR(@@gtid_binlog_pos, '$saved_gtid'), "Binlog pos ok", CONCAT("Unexpected binlog pos: ", @@gtid_binlog_pos, "; does not contain the GTID $saved_gtid.")) AS gtid_check; eval SELECT IF(INSTR(@@gtid_binlog_pos, '$saved_gtid'), "Binlog pos ok", CONCAT("Unexpected binlog pos: ", @@gtid_binlog_pos, "; does not contain the GTID $saved_gtid.")) AS gtid_check;
--enable_query_log --enable_query_log
--echo # Wait 30 seconds for SQL thread to catch up with IO thread --echo # Wait 60 seconds for SQL thread to catch up with IO thread
--connection server_2 --connection server_2
--let $wait_timeout= 300 --let $wait_timeout= 600
while ($wait_timeout != 0) while ($wait_timeout != 0)
{ {
--let $read_log_pos= query_get_value('SHOW SLAVE STATUS', Read_Master_Log_Pos, 1) --let $read_log_pos= query_get_value('SHOW SLAVE STATUS', Read_Master_Log_Pos, 1)
@ -442,9 +442,9 @@ eval SELECT IF(INSTR(@@gtid_binlog_pos, '$saved_gtid'), "Binlog pos ok", CONCAT(
eval SELECT IF(INSTR(@@gtid_current_pos, '$saved_gtid'), "Current pos ok", CONCAT("Unexpected current pos: ", @@gtid_current_pos, "; does not contain the GTID $saved_gtid.")) AS gtid_check; eval SELECT IF(INSTR(@@gtid_current_pos, '$saved_gtid'), "Current pos ok", CONCAT("Unexpected current pos: ", @@gtid_current_pos, "; does not contain the GTID $saved_gtid.")) AS gtid_check;
--enable_query_log --enable_query_log
--echo # Wait 30 seconds for SQL thread to catch up with IO thread --echo # Wait 60 seconds for SQL thread to catch up with IO thread
--connection server_2 --connection server_2
--let $wait_timeout= 300 --let $wait_timeout= 600
while ($wait_timeout != 0) while ($wait_timeout != 0)
{ {
--let $read_log_pos= query_get_value('SHOW SLAVE STATUS', Read_Master_Log_Pos, 1) --let $read_log_pos= query_get_value('SHOW SLAVE STATUS', Read_Master_Log_Pos, 1)
@ -533,9 +533,9 @@ EOF
--source include/wait_until_connected_again.inc --source include/wait_until_connected_again.inc
--connection server_2 --connection server_2
--echo # Wait 30 seconds for IO thread to connect and SQL thread to catch up --echo # Wait 60 seconds for IO thread to connect and SQL thread to catch up
--echo # with IO thread. --echo # with IO thread.
--let $wait_timeout= 300 --let $wait_timeout= 600
while ($wait_timeout != 0) while ($wait_timeout != 0)
{ {
--let $connected=`SELECT COUNT(*) > 0 FROM information_schema.processlist WHERE State = 'Waiting for master to send event'` --let $connected=`SELECT COUNT(*) > 0 FROM information_schema.processlist WHERE State = 'Waiting for master to send event'`