diff options
author | unknown <knielsen@knielsen-hq.org> | 2014-03-09 10:27:38 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2014-03-09 10:27:38 +0100 |
commit | 2c2478b82260f5110ea2c5bed3c6c7bcd3558453 (patch) | |
tree | 24a7a88645c37c46f734869cb8b593ea6ea4dfec /sql/rpl_parallel.cc | |
parent | 5c31e79f8bba85e555dac2e2f6e97cc1b0a2b51b (diff) | |
download | mariadb-git-2c2478b82260f5110ea2c5bed3c6c7bcd3558453.tar.gz |
MDEV-5804: If same GTID is received on multiple master connections in multi-source replication, the event is double-executed causing corruption or replication failure
Before, the arrival of same GTID twice in multi-source replication
would cause double-apply or in gtid strict mode an error.
Keep the behaviour, but add an option --gtid-ignore-duplicates which
allows to correctly handle duplicates, ignoring all but the first.
This relies on the user ensuring correct configuration so that
sequence numbers are strictly increasing within each replication
domain; then duplicates can be detected simply by comparing the
sequence numbers against what is already applied.
Only one master connection (but possibly multiple parallel worker
threads within that connection) is allowed to apply events within
one replication domain at a time; any other connection that
receives a GTID in the same domain either discards it (if it is
already applied) or waits for the other connection to not have
any events to apply.
Intermediate patch, as proof-of-concept for testing. The main limitation
is that currently it is only implemented for parallel replication,
@@slave_parallel_threads > 0.
Diffstat (limited to 'sql/rpl_parallel.cc')
-rw-r--r-- | sql/rpl_parallel.cc | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 27f17668849..d1e0ca518f1 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -202,7 +202,7 @@ handle_rpl_parallel_thread(void *arg) struct rpl_parallel_thread::queued_event *events; bool group_standalone= true; bool in_event_group= false; - bool group_skip_for_stop= false; + bool skip_event_group= false; rpl_group_info *group_rgi= NULL; group_commit_orderer *gco, *tmp_gco; uint64 event_gtid_sub_id= 0; @@ -385,13 +385,13 @@ handle_rpl_parallel_thread(void *arg) point where we can safely stop. So set a flag that will cause us to skip, rather than execute, the following events. */ - group_skip_for_stop= true; + skip_event_group= true; } else - group_skip_for_stop= false; + skip_event_group= false; if (unlikely(entry->stop_on_error_sub_id <= rgi->wait_commit_sub_id)) - group_skip_for_stop= true; + skip_event_group= true; else if (rgi->wait_commit_sub_id > entry->last_committed_sub_id) { /* @@ -420,6 +420,16 @@ handle_rpl_parallel_thread(void *arg) thd->wait_for_commit_ptr->wakeup_subsequent_commits(err); } thd->wait_for_commit_ptr= &rgi->commit_orderer; + + if (opt_gtid_ignore_duplicates) + { + int res= + rpl_global_gtid_slave_state.check_duplicate_gtid(&rgi->current_gtid, + rgi->rli); + /* ToDo: Handle res==-1 error. */ + if (!res) + skip_event_group= true; + } } group_ending= event_type == XID_EVENT || @@ -438,7 +448,7 @@ handle_rpl_parallel_thread(void *arg) processing between the event groups as a simple way to ensure that everything is stopped and cleaned up correctly. */ - if (!rgi->is_error && !group_skip_for_stop) + if (!rgi->is_error && !skip_event_group) err= rpt_handle_event(events, rpt); else err= thd->wait_for_prior_commit(); @@ -464,7 +474,7 @@ handle_rpl_parallel_thread(void *arg) rgi->next= rgis_to_free; rgis_to_free= rgi; group_rgi= rgi= NULL; - group_skip_for_stop= false; + skip_event_group= false; DEBUG_SYNC(thd, "rpl_parallel_end_of_group"); } @@ -526,7 +536,7 @@ handle_rpl_parallel_thread(void *arg) mysql_mutex_lock(&rpt->LOCK_rpl_thread); rpt->free_rgi(group_rgi); group_rgi= NULL; - group_skip_for_stop= false; + skip_event_group= false; } if (!in_event_group) { |