diff options
| author | Manish Kumar <manish.4.kumar@oracle.com> | 2012-01-23 17:39:37 +0530 |
|---|---|---|
| committer | Manish Kumar <manish.4.kumar@oracle.com> | 2012-01-23 17:39:37 +0530 |
| commit | 58a3147c6f39db6a9df2ebadd1dbc62fc361b0c4 (patch) | |
| tree | 65b1737062a06f0e93eac8106ad1248385c49cbb /sql/rpl_mi.cc | |
| parent | d29e871b681dd6934303384257b34379c0379116 (diff) | |
| download | mariadb-git-58a3147c6f39db6a9df2ebadd1dbc62fc361b0c4.tar.gz | |
BUG#11752315 - 43460: STOP SLAVE UNABLE TO COMPLETE WHEN SLAVE THREAD IS TRYING TO RECONNECT TO
Problem : The basic problem is the way the thread sleeps in mysql-5.5 and also in mysql-5.1
when we execute a stop slave on windows platform.
On windows platform if the stop slave is executed after the master dies, we have
this long wait before the stop slave return a value. This is because there is a
sleep of the thread. The sleep is uninterruptable in the two above version,
which was fixed by Davi patch for the BUG#11765860 for mysql-trunk. Backporting
his patch for mysql-5.5 fixes the problem.
Solution : A new pair of mutex and condition variable is introduced to synchronize thread
sleep and finalization. A new mutex is required because the slave threads are
terminated while holding the slave thread locks (run_lock), which can not be
relinquished during termination as this would affect the lock order.
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index 0060bcb6b1e..fd4af7a827e 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -49,9 +49,11 @@ Master_info::Master_info(bool is_slave_recovery) bzero((char*) &file, sizeof(file)); mysql_mutex_init(key_master_info_run_lock, &run_lock, MY_MUTEX_INIT_FAST); mysql_mutex_init(key_master_info_data_lock, &data_lock, MY_MUTEX_INIT_FAST); + mysql_mutex_init(key_master_info_sleep_lock, &sleep_lock, MY_MUTEX_INIT_FAST); mysql_cond_init(key_master_info_data_cond, &data_cond, NULL); mysql_cond_init(key_master_info_start_cond, &start_cond, NULL); mysql_cond_init(key_master_info_stop_cond, &stop_cond, NULL); + mysql_cond_init(key_master_info_sleep_cond, &sleep_cond, NULL); } Master_info::~Master_info() @@ -59,9 +61,11 @@ Master_info::~Master_info() delete_dynamic(&ignore_server_ids); mysql_mutex_destroy(&run_lock); mysql_mutex_destroy(&data_lock); + mysql_mutex_destroy(&sleep_lock); mysql_cond_destroy(&data_cond); mysql_cond_destroy(&start_cond); mysql_cond_destroy(&stop_cond); + mysql_cond_destroy(&sleep_cond); } /** |