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

sporadic failures of rpl.rpl_semi_sync_master_shutdown

Browse Source 
increase the MASTER_CONNECT_RETRY time under valgrind,
otherwise the slave gives up retrying before the master is ready

also, cosmetic cleanup of rpl_semi_sync_master_shutdown.test
This commit is contained in:
Sergei Golubchik
2024-04-10 19:34:15 +02:00
parent 0da1653f1b
commit 2d2172a5cf
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/include/rpl_change_topology.inc
View File

@@ -96,10 +96,11 @@
# Remove whitespace from $rpl_topology # Remove whitespace from $rpl_topology
--let $rpl_topology= `SELECT REPLACE('$rpl_topology', ' ', '')` --let $rpl_topology= `SELECT REPLACE('$rpl_topology', ' ', '')`
--source include/slow_environ.inc
--let $include_filename= rpl_change_topology.inc [new topology=$rpl_topology] --let $include_filename= rpl_change_topology.inc [new topology=$rpl_topology]
--source include/begin_include_file.inc --source include/begin_include_file.inc
if ($rpl_debug) if ($rpl_debug)
{ {
--echo ---- Check input ---- --echo ---- Check input ----
@@ -233,7 +234,7 @@ if (!$rpl_skip_change_master)
--echo "\$rpl_master_log_pos parameter not set for the master: $_rpl_master. Set log position to empty." --echo "\$rpl_master_log_pos parameter not set for the master: $_rpl_master. Set log position to empty."
} }
} }
eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_LOG_FILE = '$_rpl_master_log_file'$_rpl_master_log_pos, MASTER_CONNECT_RETRY = 1; eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_LOG_FILE = '$_rpl_master_log_file'$_rpl_master_log_pos, MASTER_CONNECT_RETRY = 1$_timeout_adjustment;
} }
if ($_rpl_master == '') if ($_rpl_master == '')
{ {

1
mysql-test/suite/rpl/r/rpl_semi_sync_master_shutdown.result
View File

@@ -21,7 +21,6 @@ connection slave;
include/wait_for_slave_sql_to_start.inc include/wait_for_slave_sql_to_start.inc
include/wait_for_slave_io_to_start.inc include/wait_for_slave_io_to_start.inc
connection master; connection master;
SET @@GLOBAL.debug_dbug="";
SET @@GLOBAL. rpl_semi_sync_master_enabled = 0; SET @@GLOBAL. rpl_semi_sync_master_enabled = 0;
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;

3
mysql-test/suite/rpl/t/rpl_semi_sync_master_shutdown.test
View File

@@ -4,8 +4,6 @@
# finishes off as specified in particular trying to connect even to a shut down # finishes off as specified in particular trying to connect even to a shut down
# master for a semisync firewell routine. # master for a semisync firewell routine.
source include/not_embedded.inc;
source include/have_debug.inc;
source include/master-slave.inc; source include/master-slave.inc;
--connection master --connection master
@@ -52,7 +50,6 @@ source include/rpl_start_server.inc;
#--source include/start_slave.inc #--source include/start_slave.inc
--connection master --connection master
SET @@GLOBAL.debug_dbug="";
--eval SET @@GLOBAL. rpl_semi_sync_master_enabled = $sav_enabled_master --eval SET @@GLOBAL. rpl_semi_sync_master_enabled = $sav_enabled_master
--connection master --connection master