database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MW-373 Wait for wsrep_ready at startup when provider is loaded

Browse Source 
Conflicts:
	mysql-test/include/kill_and_restart_mysqld.inc
This commit is contained in:
Teemu Ollakka
2017-04-24 18:39:38 +03:00
committed by Jan Lindström
parent 224ae5770f
commit dd72d66c45
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/restart_mysqld.inc
View File

@ -50,6 +50,9 @@ if (!$restart_parameters)
# Call script that will poll the server waiting for it to be back online again # Call script that will poll the server waiting for it to be back online again
--source include/wait_until_connected_again.inc --source include/wait_until_connected_again.inc
# Wait for wsrep
--source include/wait_wsrep_ready.inc
# Turn off reconnect again # Turn off reconnect again
--disable_reconnect --disable_reconnect

3
mysql-test/include/start_mysqld.inc
View File

@ -16,6 +16,9 @@ if (!$restart_parameters)
# Call script that will poll the server waiting for it to be back online again # Call script that will poll the server waiting for it to be back online again
--source include/wait_until_connected_again.inc --source include/wait_until_connected_again.inc
# Wait for wsrep
--source include/wait_wsrep_ready.inc
# Turn off reconnect again # Turn off reconnect again
--disable_reconnect --disable_reconnect

15
mysql-test/include/wait_wsrep_ready.inc Normal file
View File

@ -0,0 +1,15 @@
#
# If the wsrep plugin is loaded, wait until the wsrep provider becomes
# ready for use.
#
--disable_query_log
--disable_result_log
if (`SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`)
{
--source include/galera_wait_ready.inc
}
--enable_query_log
--enable_result_log