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

MDEV-10653: Fix segfault in SHOW MASTER STATUS with NULL inuse_relaylog

Browse Source 
The previous patch for MDEV-10653 changes the rpl_parallel::workers_idle()
function to use Relay_log_info::last_inuse_relaylog to check for idle
workers. But the code was missing a NULL check. Also, there was one place
during SQL slave thread start which was missing mutex synchronisation when
updating inuse_relaylog.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2023-12-17 18:35:14 +01:00
parent 1cbba45e6e
commit eaa4968fc5
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/rpl_parallel.cc
View File

@ -2538,8 +2538,10 @@ rpl_parallel::stop_during_until()
bool bool
rpl_parallel::workers_idle(Relay_log_info *rli) rpl_parallel::workers_idle(Relay_log_info *rli)
{ {
return rli->last_inuse_relaylog->queued_count == mysql_mutex_assert_owner(&rli->data_lock);
rli->last_inuse_relaylog->dequeued_count; return !rli->last_inuse_relaylog ||
rli->last_inuse_relaylog->queued_count ==
rli->last_inuse_relaylog->dequeued_count;
} }

8
sql/slave.cc
View File

@ -5369,19 +5369,25 @@ pthread_handler_t handle_slave_sql(void *arg)
} }
else else
rli->gtid_skip_flag = GTID_SKIP_NOT; rli->gtid_skip_flag = GTID_SKIP_NOT;
mysql_mutex_lock(&rli->data_lock);
if (init_relay_log_pos(rli, if (init_relay_log_pos(rli,
rli->group_relay_log_name, rli->group_relay_log_name,
rli->group_relay_log_pos, rli->group_relay_log_pos,
1 /*need data lock*/, &errmsg, 0 /*need data lock*/, &errmsg,
1 /*look for a description_event*/)) 1 /*look for a description_event*/))
{ {
rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR, NULL, rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR, NULL,
"Error initializing relay log position: %s", errmsg); "Error initializing relay log position: %s", errmsg);
mysql_mutex_unlock(&rli->data_lock);
goto err_before_start; goto err_before_start;
} }
rli->reset_inuse_relaylog(); rli->reset_inuse_relaylog();
if (rli->alloc_inuse_relaylog(rli->group_relay_log_name)) if (rli->alloc_inuse_relaylog(rli->group_relay_log_name))
{
mysql_mutex_unlock(&rli->data_lock);
goto err_before_start; goto err_before_start;
}
mysql_mutex_unlock(&rli->data_lock);
strcpy(rli->future_event_master_log_name, rli->group_master_log_name); strcpy(rli->future_event_master_log_name, rli->group_master_log_name);
THD_CHECK_SENTRY(thd); THD_CHECK_SENTRY(thd);