Skip to content

Commit ef3f09f

Browse files
Sujatha Sivakumarprashanttekriwal
Sujatha Sivakumar
authored and
prashanttekriwal
committed
Bug#23251517: SEMISYNC REPLICATION HANGING
Revert following bug fix: Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK IS FULL Bug#21753696: MAKE SHOW SLAVE STATUS NON BLOCKING IF IO THREAD WAITS FOR DISK SPACE This fix results in a deadlock between slave IO thread and SQL thread. (cherry picked from commit e3fea6c6dbb36c6ab21c4ab777224560e9608b53)
1 parent 9d72fb4 commit ef3f09f

File tree

13 files changed

+41
-446
lines changed

13 files changed

+41
-446
lines changed

‎mysql-test/include/assert_grep.inc

Lines changed: 0 additions & 154 deletions
This file was deleted.

‎mysql-test/include/rpl_init.inc

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#
4444
# [--let $rpl_server_count= 7]
4545
# --let $rpl_topology= 1->2->3->1->4, 2->5, 6->7
46-
# [--let $rpl_extra_connections_per_server= 1]
4746
# [--let $rpl_check_server_ids= 1]
4847
# [--let $rpl_skip_change_master= 1]
4948
# [--let $rpl_skip_start_slave= 1]
@@ -66,12 +65,6 @@
6665
# want to specify the empty topology (no server replicates at
6766
# all), you have to set $rpl_topology=none.
6867
#
69-
# $rpl_extra_connections_per_server
70-
# By default, this script creates connections server_N and
71-
# server_N_1. If you can set this variable to a number, the
72-
# script creates:
73-
# server_N, server_N_1, ..., server_N_$rpl_extra_connections_per_server
74-
#
7568
# $rpl_check_server_ids
7669
# If $rpl_check_server_ids is set, this script checks that the
7770
# @@server_id of all servers are different. This is normally
@@ -146,17 +139,8 @@ if (!$SERVER_MYPORT_4)
146139
# Check that $rpl_server_count is set
147140
if (!$rpl_server_count)
148141
{
149-
--let $rpl_server_count= `SELECT REPLACE('$rpl_topology', '->', ',')`
150-
if (`SELECT LOCATE(',', '$rpl_server_count')`)
151-
{
152-
--let $rpl_server_count= `SELECT GREATEST($rpl_server_count)`
153-
}
154-
}
155-
156-
--let $_rpl_extra_connections_per_server= $rpl_extra_connections_per_server
157-
if ($_rpl_extra_connections_per_server == '')
158-
{
159-
--let $_rpl_extra_connections_per_server= 1
142+
--let $_compute_rpl_server_count= `SELECT REPLACE('$rpl_topology', '->', ',')`
143+
--let $rpl_server_count= `SELECT GREATEST($_compute_rpl_server_count)`
160144
}
161145

162146

@@ -175,20 +159,15 @@ if (!$rpl_debug)
175159
# Create two connections to each server; reset master/slave, select
176160
# database, set autoinc variables.
177161
--let $_rpl_server= $rpl_server_count
178-
--let $underscore= _
162+
--let $_rpl_one= _1
179163
while ($_rpl_server)
180164
{
181165
# Connect.
182166
--let $rpl_server_number= $_rpl_server
183167
--let $rpl_connection_name= server_$_rpl_server
184168
--source include/rpl_connect.inc
185-
--let $_rpl_connection_number= 1
186-
while ($_rpl_connection_number <= $_rpl_extra_connections_per_server)
187-
{
188-
--let $rpl_connection_name= server_$_rpl_server$underscore$_rpl_connection_number
189-
--source include/rpl_connect.inc
190-
--inc $_rpl_connection_number
191-
}
169+
--let $rpl_connection_name= server_$_rpl_server$_rpl_one
170+
--source include/rpl_connect.inc
192171

193172
# Configure server.
194173
--let $rpl_connection_name= server_$_rpl_server

‎mysql-test/include/rpl_reconnect.inc

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# ==== Usage ====
1313
#
1414
# --let $rpl_server_number= N
15-
# [--let $rpl_extra_connections_per_server= 1]
1615
# [--let $rpl_debug= 1]
1716
# --source include/rpl_reconnect.inc
1817
#
@@ -22,7 +21,7 @@
2221
# master server, 2 the slave server, 3 the 3rd server, and so on.
2322
# Cf. include/rpl_init.inc
2423
#
25-
# $rpl_extra_connections_per_server, $rpl_debug
24+
# $rpl_debug
2625
# See include/rpl_init.inc
2726

2827
--let $include_filename= rpl_reconnect.inc
@@ -33,11 +32,6 @@ if (!$rpl_server_number)
3332
--die ERROR IN TEST: you must set $rpl_server_number before you source rpl_connect.inc
3433
}
3534

36-
if ($_rpl_extra_connections_per_server == '')
37-
{
38-
--let $_rpl_extra_connections_per_server= 1
39-
}
40-
4135

4236
if ($rpl_debug)
4337
{
@@ -78,14 +72,10 @@ if (!$_rpl_server_number)
7872
--source include/rpl_connection.inc
7973
--enable_reconnect
8074

81-
--let $_rpl_connection_number= 1
82-
while ($_rpl_connection_number <= $_rpl_extra_connections_per_server)
83-
{
84-
--let $rpl_connection_name= server_$rpl_server_number$underscore$_rpl_connection_number
85-
--source include/rpl_connection.inc
86-
--enable_reconnect
87-
--inc $_rpl_connection_number
88-
}
75+
--let $_rpl_one= _1
76+
--let $rpl_connection_name= server_$rpl_server_number$_rpl_one
77+
--source include/rpl_connection.inc
78+
--enable_reconnect
8979

9080
if ($rpl_debug)
9181
{
@@ -132,15 +122,10 @@ if (!$_rpl_server_number)
132122
--source include/wait_until_connected_again.inc
133123
--disable_reconnect
134124

135-
--let $_rpl_connection_number= 1
136-
while ($_rpl_connection_number <= $_rpl_extra_connections_per_server)
137-
{
138-
--let $rpl_connection_name= server_$rpl_server_number$underscore$_rpl_connection_number
139-
--source include/rpl_connection.inc
140-
--source include/wait_until_connected_again.inc
141-
--disable_reconnect
142-
--inc $_rpl_connection_number
143-
}
125+
--let $rpl_connection_name= server_$rpl_server_number$_rpl_one
126+
--source include/rpl_connection.inc
127+
--source include/wait_until_connected_again.inc
128+
--disable_reconnect
144129

145130

146131
--let $include_filename= rpl_reconnect.inc

‎mysql-test/include/start_slave_sql.inc

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎mysql-test/suite/rpl/r/rpl_io_thd_wait_for_disk_space.result

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)