database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

cleanup: rpl.rpl_semi_sync_shutdown_await_ack

Browse Source 
avoid using multiple files with the same functionality.
This commit is contained in:
Sergei Golubchik
2024-04-11 15:06:39 +02:00
parent e5c9904eba
commit 340d93a8cc
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/rpl_semi_sync_shutdown_await_ack.result
View File

@@ -505,8 +505,8 @@ disconnect con1;
connection default; connection default;
connection con2; connection con2;
SHUTDOWN WAIT FOR ALL SLAVES; SHUTDOWN WAIT FOR ALL SLAVES;
connection server_2; # Ensure the primary waited for the ACK of the killed thread
include/assert_grep.inc [Ensure the primary waited for the ACK of the killed thread] FOUND 5 /Delaying shutdown to await semi-sync ACK/ in mysqld.1.err
connection default; connection default;
connection server_1; connection server_1;
connection server_2; connection server_2;

14
mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test
View File

@@ -206,7 +206,6 @@ SET GLOBAL debug_dbug="+d,simulate_delay_semisync_slave_reply";
--echo # Wait for thd to begin semi-sync wait.. --echo # Wait for thd to begin semi-sync wait..
--let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE state = 'Waiting for semi-sync ACK from slave' --let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist WHERE state = 'Waiting for semi-sync ACK from slave'
--source include/wait_condition.inc --source include/wait_condition.inc
--source include/wait_condition.inc
--echo # ..done --echo # ..done
--disconnect con1 --disconnect con1
@@ -220,15 +219,10 @@ EOF
SHUTDOWN WAIT FOR ALL SLAVES; SHUTDOWN WAIT FOR ALL SLAVES;
--source include/wait_until_disconnected.inc --source include/wait_until_disconnected.inc
# Run assert_grep on server_2 as it uses SQL commands for verification, but --echo # Ensure the primary waited for the ACK of the killed thread
# server_1 has gone away --let $SEARCH_PATTERN= Delaying shutdown to await semi-sync ACK
--connection server_2 --let $SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err
--let $assert_text= Ensure the primary waited for the ACK of the killed thread --source include/search_pattern_in_file.inc
--let $assert_select= Delaying shutdown to await semi-sync ACK
--let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.1.err
--let $assert_count= 5
--let $assert_only_after=CURRENT_TEST
--source include/assert_grep.inc
--connection default --connection default
--source include/wait_until_disconnected.inc --source include/wait_until_disconnected.inc