mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-32004: Remove extra server_<num>_1
connections during initialization
- Remove extra connections in the form of `server_number_1` for the same server during initialization of servers in the `rpl_init.inc` file. - Remove disconnecting and reconnecting to the same connections, since they are not used by the test. - Update comments about the above. - Reviewer: <knielsen@knielsen-hq.org> <brandon.nesterenko@mariadb.com>
This commit is contained in:
@ -103,11 +103,9 @@ while ($_rpl_server)
|
|||||||
|
|
||||||
--connection default
|
--connection default
|
||||||
--let $_rpl_server= $rpl_server_count
|
--let $_rpl_server= $rpl_server_count
|
||||||
--let $_rpl_one= _1
|
|
||||||
while ($_rpl_server)
|
while ($_rpl_server)
|
||||||
{
|
{
|
||||||
--disconnect server_$_rpl_server
|
--disconnect server_$_rpl_server
|
||||||
--disconnect server_$_rpl_server$_rpl_one
|
|
||||||
--dec $_rpl_server
|
--dec $_rpl_server
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,10 +3,7 @@
|
|||||||
# Set up replication on several servers in a specified topology.
|
# Set up replication on several servers in a specified topology.
|
||||||
#
|
#
|
||||||
# By default, this script does the following:
|
# By default, this script does the following:
|
||||||
# - Creates the connections server_1, server_2, ..., server_N, as
|
# - Creates the connections server_1, server_2, ..., server_N.
|
||||||
# well as extra connections server_1_1, server_2_1, ...,
|
|
||||||
# server_N_1. server_I and server_I_1 are connections to the same
|
|
||||||
# server.
|
|
||||||
# - Calls RESET MASTER, RESET SLAVE, USE test, CHANGE MASTER, START SLAVE.
|
# - Calls RESET MASTER, RESET SLAVE, USE test, CHANGE MASTER, START SLAVE.
|
||||||
# - Sets the connection to server_1 before exiting.
|
# - Sets the connection to server_1 before exiting.
|
||||||
# With $rpl_check_server_ids parameter, the script does the following:
|
# With $rpl_check_server_ids parameter, the script does the following:
|
||||||
@ -143,18 +140,15 @@ if (!$rpl_debug)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Create two connections to each server; reset master/slave, select
|
# Create connection to the server; reset master/slave, select
|
||||||
# database, set autoinc variables.
|
# database, set autoinc variables.
|
||||||
--let $_rpl_server= $rpl_server_count
|
--let $_rpl_server= $rpl_server_count
|
||||||
--let $_rpl_one= _1
|
|
||||||
while ($_rpl_server)
|
while ($_rpl_server)
|
||||||
{
|
{
|
||||||
# Connect.
|
# Connect.
|
||||||
--let $rpl_server_number= $_rpl_server
|
--let $rpl_server_number= $_rpl_server
|
||||||
--let $rpl_connection_name= server_$_rpl_server
|
--let $rpl_connection_name= server_$_rpl_server
|
||||||
--source include/rpl_connect.inc
|
--source include/rpl_connect.inc
|
||||||
--let $rpl_connection_name= server_$_rpl_server$_rpl_one
|
|
||||||
--source include/rpl_connect.inc
|
|
||||||
|
|
||||||
# Configure server.
|
# Configure server.
|
||||||
--let $rpl_connection_name= server_$_rpl_server
|
--let $rpl_connection_name= server_$_rpl_server
|
||||||
|
@ -72,11 +72,6 @@ if (!$_rpl_server_number)
|
|||||||
--source include/rpl_connection.inc
|
--source include/rpl_connection.inc
|
||||||
--enable_reconnect
|
--enable_reconnect
|
||||||
|
|
||||||
--let $_rpl_one= _1
|
|
||||||
--let $rpl_connection_name= server_$rpl_server_number$_rpl_one
|
|
||||||
--source include/rpl_connection.inc
|
|
||||||
--enable_reconnect
|
|
||||||
|
|
||||||
if ($rpl_debug)
|
if ($rpl_debug)
|
||||||
{
|
{
|
||||||
--echo ---- Wait for reconnect and disable reconnect on all connections ----
|
--echo ---- Wait for reconnect and disable reconnect on all connections ----
|
||||||
@ -122,11 +117,5 @@ if (!$_rpl_server_number)
|
|||||||
--source include/wait_until_connected_again.inc
|
--source include/wait_until_connected_again.inc
|
||||||
--disable_reconnect
|
--disable_reconnect
|
||||||
|
|
||||||
--let $rpl_connection_name= server_$rpl_server_number$_rpl_one
|
|
||||||
--source include/rpl_connection.inc
|
|
||||||
--source include/wait_until_connected_again.inc
|
|
||||||
--disable_reconnect
|
|
||||||
|
|
||||||
|
|
||||||
--let $include_filename= rpl_reconnect.inc
|
--let $include_filename= rpl_reconnect.inc
|
||||||
--source include/end_include_file.inc
|
--source include/end_include_file.inc
|
||||||
|
Reference in New Issue
Block a user