1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'codership-10.4-fix-sst_received' into bb-10.4-MDEV-30419

Browse Source
This commit is contained in:
Jan Lindström 2023-01-20 11:46:18 +02:00
commit f3f09def23
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sql/wsrep_mysqld.cc
View File

@ -915,13 +915,19 @@ void wsrep_init_startup (bool sst_first)
With mysqldump SST (!sst_first) wait until the server reaches With mysqldump SST (!sst_first) wait until the server reaches
joiner state and procedd to accepting connections. joiner state and procedd to accepting connections.
*/ */
int err= 0;
if (sst_first) if (sst_first)
{ {
server_state.wait_until_state(Wsrep_server_state::s_initializing); err= server_state.wait_until_state(Wsrep_server_state::s_initializing);
} }
else else
{ {
server_state.wait_until_state(Wsrep_server_state::s_joiner); err= server_state.wait_until_state(Wsrep_server_state::s_joiner);
}
if (err)
{
WSREP_ERROR("Wsrep startup was interrupted");
unireg_abort(1);
} }
} }
@ -1016,7 +1022,11 @@ void wsrep_stop_replication(THD *thd)
{ {
WSREP_DEBUG("Disconnect provider"); WSREP_DEBUG("Disconnect provider");
Wsrep_server_state::instance().disconnect(); Wsrep_server_state::instance().disconnect();
Wsrep_server_state::instance().wait_until_state(Wsrep_server_state::s_disconnected); if (Wsrep_server_state::instance().wait_until_state(
Wsrep_server_state::s_disconnected))
{
WSREP_WARN("Wsrep interrupted while waiting for disconnected state");
}
} }
/* my connection, should not terminate with wsrep_close_client_connection(), /* my connection, should not terminate with wsrep_close_client_connection(),
@ -1038,7 +1048,11 @@ void wsrep_shutdown_replication()
{ {
WSREP_DEBUG("Disconnect provider"); WSREP_DEBUG("Disconnect provider");
Wsrep_server_state::instance().disconnect(); Wsrep_server_state::instance().disconnect();
Wsrep_server_state::instance().wait_until_state(Wsrep_server_state::s_disconnected); if (Wsrep_server_state::instance().wait_until_state(
Wsrep_server_state::s_disconnected))
{
WSREP_WARN("Wsrep interrupted while waiting for disconnected state");
}
} }
wsrep_close_client_connections(TRUE); wsrep_close_client_connections(TRUE);

11
sql/wsrep_sst.cc
View File

@ -336,9 +336,14 @@ static bool wsrep_sst_complete (THD* thd,
if ((state == Wsrep_server_state::s_joiner || if ((state == Wsrep_server_state::s_joiner ||
state == Wsrep_server_state::s_initialized)) state == Wsrep_server_state::s_initialized))
{ {
Wsrep_server_state::instance().sst_received(client_service, if (Wsrep_server_state::instance().sst_received(client_service, rcode))
rcode); {
WSREP_INFO("SST succeeded for position %s", start_pos_buf); failed= true;
}
else
{
WSREP_INFO("SST succeeded for position %s", start_pos_buf);
}
} }
else else
{ {

2
wsrep-lib

@ -1 +1 @@
Subproject commit f8ff2cfdd4c6424ffd96fc53bcc0f2e1d9ffe137 Subproject commit 275a0af8c5b92f0ee33cfe9e23f3db5f59b56e9d