database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-7145: Delayed slave.

Browse Source 
Extend to work also for parallel replication.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2016-10-14 12:22:00 +02:00
parent 09136ec304
commit 3011060b2a
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/rpl_parallel.cc
View File

@ -2418,8 +2418,17 @@ rpl_parallel::do_event(rpl_group_info *serial_rgi, Log_event *ev,
!(unlikely(rli->gtid_skip_flag != GTID_SKIP_NOT) && is_group_event)) !(unlikely(rli->gtid_skip_flag != GTID_SKIP_NOT) && is_group_event))
return -1; return -1;
/* ToDo: what to do with this lock?!? */ /* Note: rli->data_lock is released by sql_delay_event(). */
mysql_mutex_unlock(&rli->data_lock); if (sql_delay_event(ev, rli->sql_driver_thd, serial_rgi))
{
/*
If sql_delay_event() returns non-zero, it means that the wait timed out
due to slave stop. We should not queue the event in this case, it must
not be applied yet.
*/
delete ev;
return 1;
}
if (unlikely(typ == FORMAT_DESCRIPTION_EVENT)) if (unlikely(typ == FORMAT_DESCRIPTION_EVENT))
{ {

3
sql/slave.cc
View File

@ -3424,7 +3424,8 @@ has_temporary_error(THD *thd)
@retval nonzero If the delay was interrupted and the event shall be skipped. @retval nonzero If the delay was interrupted and the event shall be skipped.
*/ */
static int sql_delay_event(Log_event *ev, THD *thd, rpl_group_info *rgi) int
sql_delay_event(Log_event *ev, THD *thd, rpl_group_info *rgi)
{ {
Relay_log_info* rli= rgi->rli; Relay_log_info* rli= rgi->rli;
long sql_delay= rli->get_sql_delay(); long sql_delay= rli->get_sql_delay();

1
sql/slave.h
View File

@ -251,6 +251,7 @@ void set_slave_thread_options(THD* thd);
void set_slave_thread_default_charset(THD *thd, rpl_group_info *rgi); void set_slave_thread_default_charset(THD *thd, rpl_group_info *rgi);
int rotate_relay_log(Master_info* mi); int rotate_relay_log(Master_info* mi);
int has_temporary_error(THD *thd); int has_temporary_error(THD *thd);
int sql_delay_event(Log_event *ev, THD *thd, rpl_group_info *rgi);
int apply_event_and_update_pos(Log_event* ev, THD* thd, int apply_event_and_update_pos(Log_event* ev, THD* thd,
struct rpl_group_info *rgi); struct rpl_group_info *rgi);
int apply_event_and_update_pos_for_parallel(Log_event* ev, THD* thd, int apply_event_and_update_pos_for_parallel(Log_event* ev, THD* thd,