2013-11-19 13:16:25 +01:00
|
|
|
/* Copyright (c) 2006, 2013, Oracle and/or its affiliates.
|
|
|
|
Copyright (c) 2011, 2013, Monty Program Ab
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2006-12-27 02:23:51 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
2011-06-30 17:46:53 +02:00
|
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
2006-10-31 12:23:14 +01:00
|
|
|
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "sql_priv.h"
|
|
|
|
#include "unireg.h" // HAVE_*
|
2007-04-12 08:58:04 +02:00
|
|
|
#include "rpl_mi.h"
|
2006-10-31 12:23:14 +01:00
|
|
|
#include "rpl_rli.h"
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "sql_base.h" // close_thread_tables
|
2006-10-31 12:23:14 +01:00
|
|
|
#include <my_dir.h> // For MY_STAT
|
|
|
|
#include "sql_repl.h" // For check_binlog_magic
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "log_event.h" // Format_description_log_event, Log_event,
|
|
|
|
// FORMAT_DESCRIPTION_LOG_EVENT, ROTATE_EVENT,
|
|
|
|
// PREFIX_SQL_LOAD
|
2007-02-26 17:44:55 +01:00
|
|
|
#include "rpl_utility.h"
|
2009-12-03 19:37:38 +01:00
|
|
|
#include "transaction.h"
|
2010-03-31 16:05:33 +02:00
|
|
|
#include "sql_parse.h" // end_trans, ROLLBACK
|
2010-10-28 16:31:21 +02:00
|
|
|
#include <mysql/plugin.h>
|
|
|
|
#include <mysql/service_thd_wait.h>
|
2006-10-31 12:23:14 +01:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
static int count_relay_log_space(Relay_log_info* rli);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
2012-11-05 15:01:49 +01:00
|
|
|
/**
|
|
|
|
Current replication state (hash of last GTID executed, per replication
|
|
|
|
domain).
|
|
|
|
*/
|
|
|
|
rpl_slave_state rpl_global_gtid_slave_state;
|
2014-02-07 19:15:28 +01:00
|
|
|
/* Object used for MASTER_GTID_WAIT(). */
|
|
|
|
gtid_waiting rpl_global_gtid_waiting;
|
2012-11-05 15:01:49 +01:00
|
|
|
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
// Defined in slave.cc
|
|
|
|
int init_intvar_from_file(int* var, IO_CACHE* f, int default_val);
|
|
|
|
int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
|
|
|
|
const char *default_val);
|
|
|
|
|
BUG#40337 Fsyncing master and relay log to disk after every event is too slow
NOTE: Backporting the patch to next-mr.
The fix proposed in BUG#35542 and BUG#31665 introduces a performance issue
when fsyncing the master.info, relay.info and relay-log.bin* after #th events.
Although such solution has been proposed to reduce the probability of corrupted
files due to a slave-crash, the performance penalty introduced by it has
made the approach impractical for highly intensive workloads.
In a nutshell, the option --syn-relay-log proposed in BUG#35542 and BUG#31665
simultaneously fsyncs master.info, relay-log.info and relay-log.bin* and
this is the main source of performance issues.
This patch introduces new options that give more control to the user on
what should be fsynced and how often:
1) (--sync-master-info, integer) which syncs the master.info after #th event;
2) (--sync-relay-log, integer) which syncs the relay-log.bin* after #th
events.
3) (--sync-relay-log-info, integer) which syncs the relay.info after #th
transactions.
To provide both performance and increased reliability, we recommend the following
setup:
1) --sync-master-info = 0 eventually the operating system will fsync it;
2) --sync-relay-log = 0 eventually the operating system will fsync it;
3) --sync-relay-log-info = 1 fsyncs it after every transaction;
Notice, that the previous setup does not reduce the probability of
corrupted master.info and relay-log.bin*. To overcome the issue, this patch also
introduces a recovery mechanism that right after restart throws away relay-log.bin*
retrieved from a master and updates the master.info based on the relay.info:
4) (--relay-log-recovery, boolean) which enables a recovery mechanism that
throws away relay-log.bin* after a crash.
However, it can only recover the incorrect binlog file and position in master.info,
if other informations (host, port password, etc) are corrupted or incorrect,
then this recovery mechanism will fail to work.
2009-09-29 16:40:52 +02:00
|
|
|
Relay_log_info::Relay_log_info(bool is_slave_recovery)
|
2007-06-09 07:19:37 +02:00
|
|
|
:Slave_reporting_capability("SQL"),
|
2007-06-09 08:29:51 +02:00
|
|
|
no_storage(FALSE), replicate_same_server_id(::replicate_same_server_id),
|
2009-09-29 16:27:12 +02:00
|
|
|
info_fd(-1), cur_log_fd(-1), relay_log(&sync_relaylog_period),
|
BUG#40337 Fsyncing master and relay log to disk after every event is too slow
NOTE: Backporting the patch to next-mr.
The fix proposed in BUG#35542 and BUG#31665 introduces a performance issue
when fsyncing the master.info, relay.info and relay-log.bin* after #th events.
Although such solution has been proposed to reduce the probability of corrupted
files due to a slave-crash, the performance penalty introduced by it has
made the approach impractical for highly intensive workloads.
In a nutshell, the option --syn-relay-log proposed in BUG#35542 and BUG#31665
simultaneously fsyncs master.info, relay-log.info and relay-log.bin* and
this is the main source of performance issues.
This patch introduces new options that give more control to the user on
what should be fsynced and how often:
1) (--sync-master-info, integer) which syncs the master.info after #th event;
2) (--sync-relay-log, integer) which syncs the relay-log.bin* after #th
events.
3) (--sync-relay-log-info, integer) which syncs the relay.info after #th
transactions.
To provide both performance and increased reliability, we recommend the following
setup:
1) --sync-master-info = 0 eventually the operating system will fsync it;
2) --sync-relay-log = 0 eventually the operating system will fsync it;
3) --sync-relay-log-info = 1 fsyncs it after every transaction;
Notice, that the previous setup does not reduce the probability of
corrupted master.info and relay-log.bin*. To overcome the issue, this patch also
introduces a recovery mechanism that right after restart throws away relay-log.bin*
retrieved from a master and updates the master.info based on the relay.info:
4) (--relay-log-recovery, boolean) which enables a recovery mechanism that
throws away relay-log.bin* after a crash.
However, it can only recover the incorrect binlog file and position in master.info,
if other informations (host, port password, etc) are corrupted or incorrect,
then this recovery mechanism will fail to work.
2009-09-29 16:40:52 +02:00
|
|
|
sync_counter(0), is_relay_log_recovery(is_slave_recovery),
|
2013-04-17 21:33:33 +02:00
|
|
|
save_temporary_tables(0), mi(0),
|
|
|
|
cur_log_old_open_count(0), group_relay_log_pos(0),
|
2009-10-23 00:30:28 +02:00
|
|
|
event_relay_log_pos(0),
|
2009-05-06 14:03:24 +02:00
|
|
|
#if HAVE_valgrind
|
2008-02-11 12:04:30 +01:00
|
|
|
is_fake(FALSE),
|
|
|
|
#endif
|
2008-02-18 12:35:44 +01:00
|
|
|
group_master_log_pos(0), log_space_total(0), ignore_log_space_limit(0),
|
2014-01-08 11:00:44 +01:00
|
|
|
last_master_timestamp(0), sql_thread_caught_up(true), slave_skip_counter(0),
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
abort_pos_wait(0), slave_run_id(0), sql_driver_thd(),
|
2006-10-31 12:23:14 +01:00
|
|
|
inited(0), abort_slave(0), slave_running(0), until_condition(UNTIL_NONE),
|
2012-10-03 00:44:54 +02:00
|
|
|
until_log_pos(0), retried_trans(0), executed_entries(0),
|
2013-10-14 23:17:16 +02:00
|
|
|
m_flags(0)
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::Relay_log_info");
|
2006-10-31 12:23:14 +01:00
|
|
|
|
2012-12-14 15:38:07 +01:00
|
|
|
relay_log.is_relay_log= TRUE;
|
2011-03-01 17:39:28 +01:00
|
|
|
#ifdef HAVE_PSI_INTERFACE
|
|
|
|
relay_log.set_psi_keys(key_RELAYLOG_LOCK_index,
|
|
|
|
key_RELAYLOG_update_cond,
|
|
|
|
key_file_relaylog,
|
2011-10-25 12:53:40 +02:00
|
|
|
key_file_relaylog_index,
|
|
|
|
key_RELAYLOG_COND_queue_busy);
|
2011-03-01 17:39:28 +01:00
|
|
|
#endif
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
group_relay_log_name[0]= event_relay_log_name[0]=
|
|
|
|
group_master_log_name[0]= 0;
|
2007-06-09 07:19:37 +02:00
|
|
|
until_log_name[0]= ign_master_log_name_end[0]= 0;
|
2012-10-01 01:30:44 +02:00
|
|
|
max_relay_log_size= global_system_variables.max_relay_log_size;
|
2006-10-31 12:23:14 +01:00
|
|
|
bzero((char*) &info_file, sizeof(info_file));
|
|
|
|
bzero((char*) &cache_buf, sizeof(cache_buf));
|
|
|
|
cached_charset_invalidate();
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_init(key_relay_log_info_run_lock, &run_lock, MY_MUTEX_INIT_FAST);
|
|
|
|
mysql_mutex_init(key_relay_log_info_data_lock,
|
|
|
|
&data_lock, MY_MUTEX_INIT_FAST);
|
|
|
|
mysql_mutex_init(key_relay_log_info_log_space_lock,
|
|
|
|
&log_space_lock, MY_MUTEX_INIT_FAST);
|
|
|
|
mysql_cond_init(key_relay_log_info_data_cond, &data_cond, NULL);
|
|
|
|
mysql_cond_init(key_relay_log_info_start_cond, &start_cond, NULL);
|
|
|
|
mysql_cond_init(key_relay_log_info_stop_cond, &stop_cond, NULL);
|
|
|
|
mysql_cond_init(key_relay_log_info_log_space_cond, &log_space_cond, NULL);
|
2006-10-31 12:23:14 +01:00
|
|
|
relay_log.init_pthread_objects();
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
Relay_log_info::~Relay_log_info()
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::~Relay_log_info");
|
2006-10-31 12:23:14 +01:00
|
|
|
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_destroy(&run_lock);
|
|
|
|
mysql_mutex_destroy(&data_lock);
|
|
|
|
mysql_mutex_destroy(&log_space_lock);
|
|
|
|
mysql_cond_destroy(&data_cond);
|
|
|
|
mysql_cond_destroy(&start_cond);
|
|
|
|
mysql_cond_destroy(&stop_cond);
|
|
|
|
mysql_cond_destroy(&log_space_cond);
|
2006-10-31 12:23:14 +01:00
|
|
|
relay_log.cleanup();
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int init_relay_log_info(Relay_log_info* rli,
|
2006-10-31 12:23:14 +01:00
|
|
|
const char* info_fname)
|
|
|
|
{
|
|
|
|
char fname[FN_REFLEN+128];
|
|
|
|
int info_fd;
|
|
|
|
const char* msg = 0;
|
|
|
|
int error = 0;
|
|
|
|
DBUG_ENTER("init_relay_log_info");
|
|
|
|
DBUG_ASSERT(!rli->no_storage); // Don't init if there is no storage
|
|
|
|
|
|
|
|
if (rli->inited) // Set if this function called
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
fn_format(fname, info_fname, mysql_data_home, "", 4+32);
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&rli->data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
info_fd = rli->info_fd;
|
|
|
|
rli->cur_log_fd = -1;
|
|
|
|
rli->slave_skip_counter=0;
|
|
|
|
rli->abort_pos_wait=0;
|
|
|
|
rli->log_space_limit= relay_log_space_limit;
|
|
|
|
rli->log_space_total= 0;
|
|
|
|
|
2009-04-19 03:21:33 +02:00
|
|
|
char pattern[FN_REFLEN];
|
2009-11-28 05:43:16 +01:00
|
|
|
(void) my_realpath(pattern, slave_load_tmpdir, 0);
|
|
|
|
if (fn_format(pattern, PREFIX_SQL_LOAD, pattern, "",
|
2009-04-19 03:21:33 +02:00
|
|
|
MY_SAFE_PATH | MY_RETURN_REAL_PATH) == NullS)
|
|
|
|
{
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2009-04-19 03:21:33 +02:00
|
|
|
sql_print_error("Unable to use slave's temporary directory %s",
|
|
|
|
slave_load_tmpdir);
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
unpack_filename(rli->slave_patternload_file, pattern);
|
2009-02-21 10:36:07 +01:00
|
|
|
rli->slave_patternload_file_size= strlen(rli->slave_patternload_file);
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
/*
|
|
|
|
The relay log will now be opened, as a SEQ_READ_APPEND IO_CACHE.
|
|
|
|
Note that the I/O thread flushes it to disk after writing every
|
2010-02-03 17:56:17 +01:00
|
|
|
event, in flush_master_info(mi, 1, ?).
|
2006-10-31 12:23:14 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
{
|
2009-11-05 07:07:31 +01:00
|
|
|
/* Reports an error and returns, if the --relay-log's path
|
|
|
|
is a directory.*/
|
|
|
|
if (opt_relay_logname &&
|
|
|
|
opt_relay_logname[strlen(opt_relay_logname) - 1] == FN_LIBCHAR)
|
|
|
|
{
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2009-11-05 07:07:31 +01:00
|
|
|
sql_print_error("Path '%s' is a directory name, please specify \
|
|
|
|
a file name for --relay-log option", opt_relay_logname);
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reports an error and returns, if the --relay-log-index's path
|
|
|
|
is a directory.*/
|
|
|
|
if (opt_relaylog_index_name &&
|
|
|
|
opt_relaylog_index_name[strlen(opt_relaylog_index_name) - 1]
|
|
|
|
== FN_LIBCHAR)
|
|
|
|
{
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2009-11-05 07:07:31 +01:00
|
|
|
sql_print_error("Path '%s' is a directory name, please specify \
|
|
|
|
a file name for --relay-log-index option", opt_relaylog_index_name);
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
char buf[FN_REFLEN];
|
|
|
|
const char *ln;
|
|
|
|
static bool name_warning_sent= 0;
|
|
|
|
ln= rli->relay_log.generate_name(opt_relay_logname, "-relay-bin",
|
|
|
|
1, buf);
|
|
|
|
/* We send the warning only at startup, not after every RESET SLAVE */
|
2013-01-11 01:03:43 +01:00
|
|
|
if (!opt_relay_logname && !opt_relaylog_index_name && !name_warning_sent &&
|
|
|
|
!opt_bootstrap)
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
User didn't give us info to name the relay log index file.
|
|
|
|
Picking `hostname`-relay-bin.index like we do, causes replication to
|
|
|
|
fail if this slave's hostname is changed later. So, we would like to
|
|
|
|
instead require a name. But as we don't want to break many existing
|
|
|
|
setups, we only give warning, not error.
|
|
|
|
*/
|
|
|
|
sql_print_warning("Neither --relay-log nor --relay-log-index were used;"
|
|
|
|
" so replication "
|
|
|
|
"may break when this MySQL server acts as a "
|
|
|
|
"slave and has his hostname changed!! Please "
|
2011-03-28 02:02:24 +02:00
|
|
|
"use '--log-basename=#' or '--relay-log=%s' to avoid "
|
2011-03-23 16:59:41 +01:00
|
|
|
"this problem.", ln);
|
2006-10-31 12:23:14 +01:00
|
|
|
name_warning_sent= 1;
|
|
|
|
}
|
2011-05-03 14:01:11 +02:00
|
|
|
|
2012-09-28 01:06:56 +02:00
|
|
|
/* For multimaster, add connection name to relay log filenames */
|
|
|
|
Master_info* mi= rli->mi;
|
|
|
|
char buf_relay_logname[FN_REFLEN], buf_relaylog_index_name_buff[FN_REFLEN];
|
|
|
|
char *buf_relaylog_index_name= opt_relaylog_index_name;
|
|
|
|
|
2013-05-03 00:50:42 +02:00
|
|
|
create_logfile_name_with_suffix(buf_relay_logname,
|
|
|
|
sizeof(buf_relay_logname),
|
|
|
|
ln, 1, &mi->cmp_connection_name);
|
2012-09-28 01:06:56 +02:00
|
|
|
ln= buf_relay_logname;
|
|
|
|
|
|
|
|
if (opt_relaylog_index_name)
|
|
|
|
{
|
|
|
|
buf_relaylog_index_name= buf_relaylog_index_name_buff;
|
2012-10-03 00:44:54 +02:00
|
|
|
create_logfile_name_with_suffix(buf_relaylog_index_name_buff,
|
2013-05-03 00:50:42 +02:00
|
|
|
sizeof(buf_relaylog_index_name_buff),
|
|
|
|
opt_relaylog_index_name, 0,
|
|
|
|
&mi->cmp_connection_name);
|
2012-09-28 01:06:56 +02:00
|
|
|
}
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
/*
|
|
|
|
note, that if open() fails, we'll still have index file open
|
|
|
|
but a destructor will take care of that
|
|
|
|
*/
|
2012-09-28 01:06:56 +02:00
|
|
|
if (rli->relay_log.open_index_file(buf_relaylog_index_name, ln, TRUE) ||
|
2012-09-13 14:31:29 +02:00
|
|
|
rli->relay_log.open(ln, LOG_BIN, 0, SEQ_READ_APPEND,
|
2012-10-01 01:30:44 +02:00
|
|
|
mi->rli.max_relay_log_size, 1, TRUE))
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2012-09-28 01:06:56 +02:00
|
|
|
sql_print_error("Failed when trying to open logs for '%s' in init_relay_log_info(). Error: %M", ln, my_errno);
|
2006-10-31 12:23:14 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if file does not exist */
|
|
|
|
if (access(fname,F_OK))
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
If someone removed the file from underneath our feet, just close
|
|
|
|
the old descriptor and re-create the old file
|
|
|
|
*/
|
|
|
|
if (info_fd >= 0)
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_file_close(info_fd, MYF(MY_WME));
|
|
|
|
if ((info_fd= mysql_file_open(key_file_relay_log_info,
|
|
|
|
fname, O_CREAT|O_RDWR|O_BINARY, MYF(MY_WME))) < 0)
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
sql_print_error("Failed to create a new relay log info file (\
|
|
|
|
file '%s', errno %d)", fname, my_errno);
|
2009-09-10 11:18:29 +02:00
|
|
|
msg= current_thd->stmt_da->message();
|
2006-10-31 12:23:14 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (init_io_cache(&rli->info_file, info_fd, IO_SIZE*2, READ_CACHE, 0L,0,
|
|
|
|
MYF(MY_WME)))
|
|
|
|
{
|
|
|
|
sql_print_error("Failed to create a cache on relay log info file '%s'",
|
|
|
|
fname);
|
2009-09-10 11:18:29 +02:00
|
|
|
msg= current_thd->stmt_da->message();
|
2006-10-31 12:23:14 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Init relay log with first entry in the relay index file */
|
|
|
|
if (init_relay_log_pos(rli,NullS,BIN_LOG_HEADER_SIZE,0 /* no data lock */,
|
|
|
|
&msg, 0))
|
|
|
|
{
|
|
|
|
sql_print_error("Failed to open the relay log 'FIRST' (relay_log_pos 4)");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
rli->group_master_log_name[0]= 0;
|
|
|
|
rli->group_master_log_pos= 0;
|
|
|
|
rli->info_fd= info_fd;
|
|
|
|
}
|
|
|
|
else // file exists
|
|
|
|
{
|
|
|
|
if (info_fd >= 0)
|
|
|
|
reinit_io_cache(&rli->info_file, READ_CACHE, 0L,0,0);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int error=0;
|
2010-01-07 06:42:07 +01:00
|
|
|
if ((info_fd= mysql_file_open(key_file_relay_log_info,
|
|
|
|
fname, O_RDWR|O_BINARY, MYF(MY_WME))) < 0)
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
sql_print_error("\
|
|
|
|
Failed to open the existing relay log info file '%s' (errno %d)",
|
|
|
|
fname, my_errno);
|
|
|
|
error= 1;
|
|
|
|
}
|
|
|
|
else if (init_io_cache(&rli->info_file, info_fd,
|
|
|
|
IO_SIZE*2, READ_CACHE, 0L, 0, MYF(MY_WME)))
|
|
|
|
{
|
|
|
|
sql_print_error("Failed to create a cache on relay log info file '%s'",
|
|
|
|
fname);
|
|
|
|
error= 1;
|
|
|
|
}
|
|
|
|
if (error)
|
|
|
|
{
|
|
|
|
if (info_fd >= 0)
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_file_close(info_fd, MYF(0));
|
2006-10-31 12:23:14 +01:00
|
|
|
rli->info_fd= -1;
|
|
|
|
rli->relay_log.close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT);
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
rli->info_fd = info_fd;
|
|
|
|
int relay_log_pos, master_log_pos;
|
|
|
|
if (init_strvar_from_file(rli->group_relay_log_name,
|
|
|
|
sizeof(rli->group_relay_log_name),
|
|
|
|
&rli->info_file, "") ||
|
|
|
|
init_intvar_from_file(&relay_log_pos,
|
|
|
|
&rli->info_file, BIN_LOG_HEADER_SIZE) ||
|
|
|
|
init_strvar_from_file(rli->group_master_log_name,
|
|
|
|
sizeof(rli->group_master_log_name),
|
|
|
|
&rli->info_file, "") ||
|
|
|
|
init_intvar_from_file(&master_log_pos, &rli->info_file, 0))
|
|
|
|
{
|
|
|
|
msg="Error reading slave log configuration";
|
|
|
|
goto err;
|
|
|
|
}
|
2013-04-17 19:42:34 +02:00
|
|
|
strmake_buf(rli->event_relay_log_name,rli->group_relay_log_name);
|
2006-10-31 12:23:14 +01:00
|
|
|
rli->group_relay_log_pos= rli->event_relay_log_pos= relay_log_pos;
|
|
|
|
rli->group_master_log_pos= master_log_pos;
|
|
|
|
|
2009-09-30 23:41:05 +02:00
|
|
|
if (rli->is_relay_log_recovery && init_recovery(rli->mi, &msg))
|
|
|
|
goto err;
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
if (init_relay_log_pos(rli,
|
|
|
|
rli->group_relay_log_name,
|
|
|
|
rli->group_relay_log_pos,
|
|
|
|
0 /* no data lock*/,
|
|
|
|
&msg, 0))
|
|
|
|
{
|
|
|
|
char llbuf[22];
|
|
|
|
sql_print_error("Failed to open the relay log '%s' (relay_log_pos %s)",
|
|
|
|
rli->group_relay_log_name,
|
|
|
|
llstr(rli->group_relay_log_pos, llbuf));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
{
|
|
|
|
char llbuf1[22], llbuf2[22];
|
|
|
|
DBUG_PRINT("info", ("my_b_tell(rli->cur_log)=%s rli->event_relay_log_pos=%s",
|
|
|
|
llstr(my_b_tell(rli->cur_log),llbuf1),
|
|
|
|
llstr(rli->event_relay_log_pos,llbuf2)));
|
|
|
|
DBUG_ASSERT(rli->event_relay_log_pos >= BIN_LOG_HEADER_SIZE);
|
|
|
|
DBUG_ASSERT(my_b_tell(rli->cur_log) == rli->event_relay_log_pos);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
Now change the cache from READ to WRITE - must do this
|
|
|
|
before flush_relay_log_info
|
|
|
|
*/
|
|
|
|
reinit_io_cache(&rli->info_file, WRITE_CACHE,0L,0,1);
|
|
|
|
if ((error= flush_relay_log_info(rli)))
|
2009-09-30 23:41:05 +02:00
|
|
|
{
|
|
|
|
msg= "Failed to flush relay log info file";
|
|
|
|
goto err;
|
|
|
|
}
|
2006-10-31 12:23:14 +01:00
|
|
|
if (count_relay_log_space(rli))
|
|
|
|
{
|
|
|
|
msg="Error counting relay log space";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
rli->inited= 1;
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
DBUG_RETURN(error);
|
|
|
|
|
|
|
|
err:
|
2009-09-23 15:21:29 +02:00
|
|
|
sql_print_error("%s", msg);
|
2006-10-31 12:23:14 +01:00
|
|
|
end_io_cache(&rli->info_file);
|
|
|
|
if (info_fd >= 0)
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_file_close(info_fd, MYF(0));
|
2006-10-31 12:23:14 +01:00
|
|
|
rli->info_fd= -1;
|
|
|
|
rli->relay_log.close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT);
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
static inline int add_relay_log(Relay_log_info* rli,LOG_INFO* linfo)
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
MY_STAT s;
|
|
|
|
DBUG_ENTER("add_relay_log");
|
2011-03-01 17:39:28 +01:00
|
|
|
if (!mysql_file_stat(key_file_relaylog,
|
2010-01-07 06:42:07 +01:00
|
|
|
linfo->log_file_name, &s, MYF(0)))
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
sql_print_error("log %s listed in the index, but failed to stat",
|
|
|
|
linfo->log_file_name);
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
rli->log_space_total += s.st_size;
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
char buf[22];
|
|
|
|
DBUG_PRINT("info",("log_space_total: %s", llstr(rli->log_space_total,buf)));
|
|
|
|
#endif
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
static int count_relay_log_space(Relay_log_info* rli)
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
LOG_INFO linfo;
|
|
|
|
DBUG_ENTER("count_relay_log_space");
|
|
|
|
rli->log_space_total= 0;
|
|
|
|
if (rli->relay_log.find_log_pos(&linfo, NullS, 1))
|
|
|
|
{
|
|
|
|
sql_print_error("Could not find first log while counting relay log space");
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (add_relay_log(rli,&linfo))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
} while (!rli->relay_log.find_next_log(&linfo, 1));
|
|
|
|
/*
|
|
|
|
As we have counted everything, including what may have written in a
|
|
|
|
preceding write, we must reset bytes_written, or we may count some space
|
|
|
|
twice.
|
|
|
|
*/
|
|
|
|
rli->relay_log.reset_bytes_written();
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2007-08-16 07:37:50 +02:00
|
|
|
Reset UNTIL condition for Relay_log_info
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
clear_until_condition()
|
2007-08-16 07:37:50 +02:00
|
|
|
rli - Relay_log_info structure where UNTIL condition should be reset
|
2006-10-31 12:23:14 +01:00
|
|
|
*/
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
void Relay_log_info::clear_until_condition()
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
DBUG_ENTER("clear_until_condition");
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
until_condition= Relay_log_info::UNTIL_NONE;
|
2006-10-31 12:23:14 +01:00
|
|
|
until_log_name[0]= 0;
|
|
|
|
until_log_pos= 0;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Open the given relay log
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
init_relay_log_pos()
|
|
|
|
rli Relay information (will be initialized)
|
|
|
|
log Name of relay log file to read from. NULL = First log
|
|
|
|
pos Position in relay log file
|
|
|
|
need_data_lock Set to 1 if this functions should do mutex locks
|
|
|
|
errmsg Store pointer to error message here
|
|
|
|
look_for_description_event
|
|
|
|
1 if we should look for such an event. We only need
|
|
|
|
this when the SQL thread starts and opens an existing
|
|
|
|
relay log and has to execute it (possibly from an
|
|
|
|
offset >4); then we need to read the first event of
|
|
|
|
the relay log to be able to parse the events we have
|
|
|
|
to execute.
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
- Close old open relay log files.
|
|
|
|
- If we are using the same relay log as the running IO-thread, then set
|
|
|
|
rli->cur_log to point to the same IO_CACHE entry.
|
|
|
|
- If not, open the 'log' binary file.
|
|
|
|
|
|
|
|
TODO
|
|
|
|
- check proper initialization of group_master_log_name/group_master_log_pos
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
0 ok
|
|
|
|
1 error. errmsg is set to point to the error message
|
|
|
|
*/
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int init_relay_log_pos(Relay_log_info* rli,const char* log,
|
2006-10-31 12:23:14 +01:00
|
|
|
ulonglong pos, bool need_data_lock,
|
|
|
|
const char** errmsg,
|
|
|
|
bool look_for_description_event)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("init_relay_log_pos");
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("info", ("pos: %lu", (ulong) pos));
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
*errmsg=0;
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_t *log_lock= rli->relay_log.get_log_lock();
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
if (need_data_lock)
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&rli->data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Slave threads are not the only users of init_relay_log_pos(). CHANGE MASTER
|
|
|
|
is, too, and init_slave() too; these 2 functions allocate a description
|
|
|
|
event in init_relay_log_pos, which is not freed by the terminating SQL slave
|
|
|
|
thread as that thread is not started by these functions. So we have to free
|
|
|
|
the description_event here, in case, so that there is no memory leak in
|
|
|
|
running, say, CHANGE MASTER.
|
|
|
|
*/
|
|
|
|
delete rli->relay_log.description_event_for_exec;
|
|
|
|
/*
|
|
|
|
By default the relay log is in binlog format 3 (4.0).
|
|
|
|
Even if format is 4, this will work enough to read the first event
|
|
|
|
(Format_desc) (remember that format 4 is just lenghtened compared to format
|
|
|
|
3; format 3 is a prefix of format 4).
|
|
|
|
*/
|
|
|
|
rli->relay_log.description_event_for_exec= new
|
|
|
|
Format_description_log_event(3);
|
|
|
|
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(log_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
/* Close log file and free buffers if it's already open */
|
|
|
|
if (rli->cur_log_fd >= 0)
|
|
|
|
{
|
|
|
|
end_io_cache(&rli->cache_buf);
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_file_close(rli->cur_log_fd, MYF(MY_WME));
|
2006-10-31 12:23:14 +01:00
|
|
|
rli->cur_log_fd = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
rli->group_relay_log_pos = rli->event_relay_log_pos = pos;
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
rli->clear_flag(Relay_log_info::IN_STMT);
|
|
|
|
rli->clear_flag(Relay_log_info::IN_TRANSACTION);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Test to see if the previous run was with the skip of purging
|
|
|
|
If yes, we do not purge when we restart
|
|
|
|
*/
|
|
|
|
if (rli->relay_log.find_log_pos(&rli->linfo, NullS, 1))
|
|
|
|
{
|
|
|
|
*errmsg="Could not find first log during relay log initialization";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (log && rli->relay_log.find_log_pos(&rli->linfo, log, 1))
|
|
|
|
{
|
|
|
|
*errmsg="Could not find target log during relay log initialization";
|
|
|
|
goto err;
|
|
|
|
}
|
2013-04-17 19:42:34 +02:00
|
|
|
strmake_buf(rli->group_relay_log_name,rli->linfo.log_file_name);
|
|
|
|
strmake_buf(rli->event_relay_log_name,rli->linfo.log_file_name);
|
2006-10-31 12:23:14 +01:00
|
|
|
if (rli->relay_log.is_active(rli->linfo.log_file_name))
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
The IO thread is using this log file.
|
|
|
|
In this case, we will use the same IO_CACHE pointer to
|
|
|
|
read data as the IO thread is using to write data.
|
|
|
|
*/
|
|
|
|
my_b_seek((rli->cur_log=rli->relay_log.get_log_file()), (off_t)0);
|
|
|
|
if (check_binlog_magic(rli->cur_log,errmsg))
|
|
|
|
goto err;
|
|
|
|
rli->cur_log_old_open_count=rli->relay_log.get_open_count();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Open the relay log and set rli->cur_log to point at this one
|
|
|
|
*/
|
|
|
|
if ((rli->cur_log_fd=open_binlog(&rli->cache_buf,
|
|
|
|
rli->linfo.log_file_name,errmsg)) < 0)
|
|
|
|
goto err;
|
|
|
|
rli->cur_log = &rli->cache_buf;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
In all cases, check_binlog_magic() has been called so we're at offset 4 for
|
|
|
|
sure.
|
|
|
|
*/
|
|
|
|
if (pos > BIN_LOG_HEADER_SIZE) /* If pos<=4, we stay at 4 */
|
|
|
|
{
|
|
|
|
Log_event* ev;
|
|
|
|
while (look_for_description_event)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Read the possible Format_description_log_event; if position
|
|
|
|
was 4, no need, it will be read naturally.
|
|
|
|
*/
|
|
|
|
DBUG_PRINT("info",("looking for a Format_description_log_event"));
|
|
|
|
|
|
|
|
if (my_b_tell(rli->cur_log) >= pos)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Because of we have rli->data_lock and log_lock, we can safely read an
|
|
|
|
event
|
|
|
|
*/
|
2011-05-03 14:01:11 +02:00
|
|
|
if (!(ev= Log_event::read_log_event(rli->cur_log, 0,
|
|
|
|
rli->relay_log.description_event_for_exec,
|
|
|
|
opt_slave_sql_verify_checksum)))
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("could not read event, rli->cur_log->error=%d",
|
|
|
|
rli->cur_log->error));
|
|
|
|
if (rli->cur_log->error) /* not EOF */
|
|
|
|
{
|
|
|
|
*errmsg= "I/O error reading event at position 4";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (ev->get_type_code() == FORMAT_DESCRIPTION_EVENT)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("found Format_description_log_event"));
|
|
|
|
delete rli->relay_log.description_event_for_exec;
|
|
|
|
rli->relay_log.description_event_for_exec= (Format_description_log_event*) ev;
|
|
|
|
/*
|
|
|
|
As ev was returned by read_log_event, it has passed is_valid(), so
|
|
|
|
my_malloc() in ctor worked, no need to check again.
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
Ok, we found a Format_description event. But it is not sure that this
|
|
|
|
describes the whole relay log; indeed, one can have this sequence
|
|
|
|
(starting from position 4):
|
|
|
|
Format_desc (of slave)
|
|
|
|
Rotate (of master)
|
|
|
|
Format_desc (of master)
|
|
|
|
So the Format_desc which really describes the rest of the relay log
|
|
|
|
is the 3rd event (it can't be further than that, because we rotate
|
|
|
|
the relay log when we queue a Rotate event from the master).
|
|
|
|
But what describes the Rotate is the first Format_desc.
|
|
|
|
So what we do is:
|
|
|
|
go on searching for Format_description events, until you exceed the
|
|
|
|
position (argument 'pos') or until you find another event than Rotate
|
|
|
|
or Format_desc.
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("found event of another type=%d",
|
|
|
|
ev->get_type_code()));
|
|
|
|
look_for_description_event= (ev->get_type_code() == ROTATE_EVENT);
|
|
|
|
delete ev;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
my_b_seek(rli->cur_log,(off_t)pos);
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
{
|
|
|
|
char llbuf1[22], llbuf2[22];
|
|
|
|
DBUG_PRINT("info", ("my_b_tell(rli->cur_log)=%s rli->event_relay_log_pos=%s",
|
|
|
|
llstr(my_b_tell(rli->cur_log),llbuf1),
|
|
|
|
llstr(rli->event_relay_log_pos,llbuf2)));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
err:
|
|
|
|
/*
|
|
|
|
If we don't purge, we can't honour relay_log_space_limit ;
|
|
|
|
silently discard it
|
|
|
|
*/
|
|
|
|
if (!relay_log_purge)
|
|
|
|
rli->log_space_limit= 0;
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_cond_broadcast(&rli->data_cond);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(log_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
if (need_data_lock)
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
if (!rli->relay_log.description_event_for_exec->is_valid() && !*errmsg)
|
|
|
|
*errmsg= "Invalid Format_description log event; could be out of memory";
|
|
|
|
|
|
|
|
DBUG_RETURN ((*errmsg) ? 1 : 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Waits until the SQL thread reaches (has executed up to) the
|
|
|
|
log/position or timed out.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
wait_for_pos()
|
|
|
|
thd client thread that sent SELECT MASTER_POS_WAIT
|
|
|
|
log_name log name to wait for
|
|
|
|
log_pos position to wait for
|
|
|
|
timeout timeout in seconds before giving up waiting
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
timeout is longlong whereas it should be ulong ; but this is
|
|
|
|
to catch if the user submitted a negative timeout.
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
-2 improper arguments (log_pos<0)
|
|
|
|
or slave not running, or master info changed
|
|
|
|
during the function's execution,
|
|
|
|
or client thread killed. -2 is translated to NULL by caller
|
|
|
|
-1 timed out
|
|
|
|
>=0 number of log events the function had to wait
|
|
|
|
before reaching the desired log/position
|
|
|
|
*/
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int Relay_log_info::wait_for_pos(THD* thd, String* log_name,
|
2006-10-31 12:23:14 +01:00
|
|
|
longlong log_pos,
|
|
|
|
longlong timeout)
|
|
|
|
{
|
|
|
|
int event_count = 0;
|
|
|
|
ulong init_abort_pos_wait;
|
|
|
|
int error=0;
|
|
|
|
struct timespec abstime; // for timeout checking
|
|
|
|
const char *msg;
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::wait_for_pos");
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
if (!inited)
|
2008-03-14 17:52:57 +01:00
|
|
|
DBUG_RETURN(-2);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
DBUG_PRINT("enter",("log_name: '%s' log_pos: %lu timeout: %lu",
|
|
|
|
log_name->c_ptr(), (ulong) log_pos, (ulong) timeout));
|
|
|
|
|
|
|
|
set_timespec(abstime,timeout);
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
msg= thd->enter_cond(&data_cond, &data_lock,
|
|
|
|
"Waiting for the slave SQL thread to "
|
|
|
|
"advance position");
|
|
|
|
/*
|
|
|
|
This function will abort when it notices that some CHANGE MASTER or
|
|
|
|
RESET MASTER has changed the master info.
|
|
|
|
To catch this, these commands modify abort_pos_wait ; We just monitor
|
|
|
|
abort_pos_wait and see if it has changed.
|
|
|
|
Why do we have this mechanism instead of simply monitoring slave_running
|
|
|
|
in the loop (we do this too), as CHANGE MASTER/RESET SLAVE require that
|
|
|
|
the SQL thread be stopped?
|
|
|
|
This is becasue if someones does:
|
|
|
|
STOP SLAVE;CHANGE MASTER/RESET SLAVE; START SLAVE;
|
|
|
|
the change may happen very quickly and we may not notice that
|
|
|
|
slave_running briefly switches between 1/0/1.
|
|
|
|
*/
|
|
|
|
init_abort_pos_wait= abort_pos_wait;
|
|
|
|
|
|
|
|
/*
|
|
|
|
We'll need to
|
|
|
|
handle all possible log names comparisons (e.g. 999 vs 1000).
|
|
|
|
We use ulong for string->number conversion ; this is no
|
|
|
|
stronger limitation than in find_uniq_filename in sql/log.cc
|
|
|
|
*/
|
|
|
|
ulong log_name_extension;
|
|
|
|
char log_name_tmp[FN_REFLEN]; //make a char[] from String
|
|
|
|
|
|
|
|
strmake(log_name_tmp, log_name->ptr(), min(log_name->length(), FN_REFLEN-1));
|
|
|
|
|
|
|
|
char *p= fn_ext(log_name_tmp);
|
|
|
|
char *p_end;
|
|
|
|
if (!*p || log_pos<0)
|
|
|
|
{
|
|
|
|
error= -2; //means improper arguments
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
// Convert 0-3 to 4
|
|
|
|
log_pos= max(log_pos, BIN_LOG_HEADER_SIZE);
|
|
|
|
/* p points to '.' */
|
|
|
|
log_name_extension= strtoul(++p, &p_end, 10);
|
|
|
|
/*
|
|
|
|
p_end points to the first invalid character.
|
|
|
|
If it equals to p, no digits were found, error.
|
|
|
|
If it contains '\0' it means conversion went ok.
|
|
|
|
*/
|
|
|
|
if (p_end==p || *p_end)
|
|
|
|
{
|
|
|
|
error= -2;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The "compare and wait" main loop */
|
|
|
|
while (!thd->killed &&
|
|
|
|
init_abort_pos_wait == abort_pos_wait &&
|
|
|
|
slave_running)
|
|
|
|
{
|
|
|
|
bool pos_reached;
|
|
|
|
int cmp_result= 0;
|
|
|
|
|
|
|
|
DBUG_PRINT("info",
|
|
|
|
("init_abort_pos_wait: %ld abort_pos_wait: %ld",
|
|
|
|
init_abort_pos_wait, abort_pos_wait));
|
|
|
|
DBUG_PRINT("info",("group_master_log_name: '%s' pos: %lu",
|
|
|
|
group_master_log_name, (ulong) group_master_log_pos));
|
|
|
|
|
|
|
|
/*
|
|
|
|
group_master_log_name can be "", if we are just after a fresh
|
|
|
|
replication start or after a CHANGE MASTER TO MASTER_HOST/PORT
|
|
|
|
(before we have executed one Rotate event from the master) or
|
|
|
|
(rare) if the user is doing a weird slave setup (see next
|
|
|
|
paragraph). If group_master_log_name is "", we assume we don't
|
|
|
|
have enough info to do the comparison yet, so we just wait until
|
|
|
|
more data. In this case master_log_pos is always 0 except if
|
|
|
|
somebody (wrongly) sets this slave to be a slave of itself
|
|
|
|
without using --replicate-same-server-id (an unsupported
|
|
|
|
configuration which does nothing), then group_master_log_pos
|
|
|
|
will grow and group_master_log_name will stay "".
|
|
|
|
*/
|
|
|
|
if (*group_master_log_name)
|
|
|
|
{
|
|
|
|
char *basename= (group_master_log_name +
|
|
|
|
dirname_length(group_master_log_name));
|
|
|
|
/*
|
|
|
|
First compare the parts before the extension.
|
|
|
|
Find the dot in the master's log basename,
|
|
|
|
and protect against user's input error :
|
|
|
|
if the names do not match up to '.' included, return error
|
|
|
|
*/
|
|
|
|
char *q= (char*)(fn_ext(basename)+1);
|
|
|
|
if (strncmp(basename, log_name_tmp, (int)(q-basename)))
|
|
|
|
{
|
|
|
|
error= -2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
// Now compare extensions.
|
|
|
|
char *q_end;
|
|
|
|
ulong group_master_log_name_extension= strtoul(q, &q_end, 10);
|
|
|
|
if (group_master_log_name_extension < log_name_extension)
|
|
|
|
cmp_result= -1 ;
|
|
|
|
else
|
|
|
|
cmp_result= (group_master_log_name_extension > log_name_extension) ? 1 : 0 ;
|
|
|
|
|
|
|
|
pos_reached= ((!cmp_result && group_master_log_pos >= (ulonglong)log_pos) ||
|
|
|
|
cmp_result > 0);
|
|
|
|
if (pos_reached || thd->killed)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
//wait for master update, with optional timeout.
|
|
|
|
|
|
|
|
DBUG_PRINT("info",("Waiting for master update"));
|
|
|
|
/*
|
2010-01-07 06:42:07 +01:00
|
|
|
We are going to mysql_cond_(timed)wait(); if the SQL thread stops it
|
2006-10-31 12:23:14 +01:00
|
|
|
will wake us up.
|
|
|
|
*/
|
2010-10-28 16:31:21 +02:00
|
|
|
thd_wait_begin(thd, THD_WAIT_BINLOG);
|
2006-10-31 12:23:14 +01:00
|
|
|
if (timeout > 0)
|
|
|
|
{
|
|
|
|
/*
|
2010-01-07 06:42:07 +01:00
|
|
|
Note that mysql_cond_timedwait checks for the timeout
|
2006-10-31 12:23:14 +01:00
|
|
|
before for the condition ; i.e. it returns ETIMEDOUT
|
|
|
|
if the system time equals or exceeds the time specified by abstime
|
|
|
|
before the condition variable is signaled or broadcast, _or_ if
|
|
|
|
the absolute time specified by abstime has already passed at the time
|
|
|
|
of the call.
|
2010-01-07 06:42:07 +01:00
|
|
|
For that reason, mysql_cond_timedwait will do the "timeoutting" job
|
2006-10-31 12:23:14 +01:00
|
|
|
even if its condition is always immediately signaled (case of a loaded
|
|
|
|
master).
|
|
|
|
*/
|
2010-01-07 06:42:07 +01:00
|
|
|
error= mysql_cond_timedwait(&data_cond, &data_lock, &abstime);
|
2006-10-31 12:23:14 +01:00
|
|
|
}
|
|
|
|
else
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_cond_wait(&data_cond, &data_lock);
|
2010-10-28 16:31:21 +02:00
|
|
|
thd_wait_end(thd);
|
2006-10-31 12:23:14 +01:00
|
|
|
DBUG_PRINT("info",("Got signal of master update or timed out"));
|
|
|
|
if (error == ETIMEDOUT || error == ETIME)
|
|
|
|
{
|
|
|
|
error= -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
error=0;
|
|
|
|
event_count++;
|
|
|
|
DBUG_PRINT("info",("Testing if killed or SQL thread not running"));
|
|
|
|
}
|
|
|
|
|
|
|
|
err:
|
|
|
|
thd->exit_cond(msg);
|
|
|
|
DBUG_PRINT("exit",("killed: %d abort: %d slave_running: %d \
|
|
|
|
improper_arguments: %d timed_out: %d",
|
|
|
|
thd->killed_errno(),
|
|
|
|
(int) (init_abort_pos_wait != abort_pos_wait),
|
|
|
|
(int) slave_running,
|
|
|
|
(int) (error == -2),
|
|
|
|
(int) (error == -1)));
|
|
|
|
if (thd->killed || init_abort_pos_wait != abort_pos_wait ||
|
|
|
|
!slave_running)
|
|
|
|
{
|
|
|
|
error= -2;
|
|
|
|
}
|
|
|
|
DBUG_RETURN( error ? error : event_count );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
void Relay_log_info::inc_group_relay_log_pos(ulonglong log_pos,
|
2013-10-17 14:11:19 +02:00
|
|
|
rpl_group_info *rgi,
|
|
|
|
bool skip_lock)
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::inc_group_relay_log_pos");
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
if (!skip_lock)
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&data_lock);
|
2013-10-17 14:11:19 +02:00
|
|
|
rgi->inc_event_relay_log_pos();
|
2013-10-23 15:03:03 +02:00
|
|
|
DBUG_PRINT("info", ("log_pos: %lu group_master_log_pos: %lu",
|
|
|
|
(long) log_pos, (long) group_master_log_pos));
|
|
|
|
if (rgi->is_parallel_exec)
|
2013-10-17 14:11:19 +02:00
|
|
|
{
|
|
|
|
/* In case of parallel replication, do not update the position backwards. */
|
|
|
|
int cmp= strcmp(group_relay_log_name, event_relay_log_name);
|
|
|
|
if (cmp < 0)
|
|
|
|
{
|
2013-12-17 10:50:34 +01:00
|
|
|
group_relay_log_pos= rgi->future_event_relay_log_pos;
|
2013-10-17 14:11:19 +02:00
|
|
|
strmake_buf(group_relay_log_name, event_relay_log_name);
|
|
|
|
notify_group_relay_log_name_update();
|
2013-12-17 10:50:34 +01:00
|
|
|
} else if (cmp == 0 && group_relay_log_pos < rgi->future_event_relay_log_pos)
|
|
|
|
group_relay_log_pos= rgi->future_event_relay_log_pos;
|
2006-10-31 12:23:14 +01:00
|
|
|
|
2013-10-24 08:53:48 +02:00
|
|
|
/*
|
|
|
|
In the parallel case we need to update the master_log_name here, rather
|
|
|
|
than in Rotate_log_event::do_update_pos().
|
|
|
|
*/
|
2013-10-23 15:03:03 +02:00
|
|
|
cmp= strcmp(group_master_log_name, rgi->future_event_master_log_name);
|
|
|
|
if (cmp <= 0)
|
|
|
|
{
|
|
|
|
if (cmp < 0)
|
|
|
|
{
|
|
|
|
strcpy(group_master_log_name, rgi->future_event_master_log_name);
|
|
|
|
notify_group_master_log_name_update();
|
2013-10-30 07:52:30 +01:00
|
|
|
group_master_log_pos= log_pos;
|
2013-10-23 15:03:03 +02:00
|
|
|
}
|
2013-10-30 07:52:30 +01:00
|
|
|
else if (group_master_log_pos < log_pos)
|
2013-10-23 15:03:03 +02:00
|
|
|
group_master_log_pos= log_pos;
|
|
|
|
}
|
2013-10-17 14:11:19 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Non-parallel case. */
|
|
|
|
group_relay_log_pos= event_relay_log_pos;
|
|
|
|
strmake_buf(group_relay_log_name, event_relay_log_name);
|
|
|
|
notify_group_relay_log_name_update();
|
2013-10-23 15:03:03 +02:00
|
|
|
if (log_pos) // 3.23 binlogs don't have log_posx
|
|
|
|
group_master_log_pos= log_pos;
|
2013-10-17 14:11:19 +02:00
|
|
|
}
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
If the slave does not support transactions and replicates a transaction,
|
|
|
|
users should not trust group_master_log_pos (which they can display with
|
|
|
|
SHOW SLAVE STATUS or read from relay-log.info), because to compute
|
|
|
|
group_master_log_pos the slave relies on log_pos stored in the master's
|
|
|
|
binlog, but if we are in a master's transaction these positions are always
|
|
|
|
the BEGIN's one (excepted for the COMMIT), so group_master_log_pos does
|
|
|
|
not advance as it should on the non-transactional slave (it advances by
|
|
|
|
big leaps, whereas it should advance by small leaps).
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
In 4.x we used the event's len to compute the positions here. This is
|
|
|
|
wrong if the event was 3.23/4.0 and has been converted to 5.0, because
|
|
|
|
then the event's len is not what is was in the master's binlog, so this
|
|
|
|
will make a wrong group_master_log_pos (yes it's a bug in 3.23->4.0
|
|
|
|
replication: Exec_master_log_pos is wrong). Only way to solve this is to
|
|
|
|
have the original offset of the end of the event the relay log. This is
|
|
|
|
what we do in 5.0: log_pos has become "end_log_pos" (because the real use
|
|
|
|
of log_pos in 4.0 was to compute the end_log_pos; so better to store
|
|
|
|
end_log_pos instead of begin_log_pos.
|
|
|
|
If we had not done this fix here, the problem would also have appeared
|
|
|
|
when the slave and master are 5.0 but with different event length (for
|
|
|
|
example the slave is more recent than the master and features the event
|
|
|
|
UID). It would give false MASTER_POS_WAIT, false Exec_master_log_pos in
|
|
|
|
SHOW SLAVE STATUS, and so the user would do some CHANGE MASTER using this
|
|
|
|
value which would lead to badly broken replication.
|
|
|
|
Even the relay_log_pos will be corrupted in this case, because the len is
|
|
|
|
the relay log is not "val".
|
|
|
|
With the end_log_pos solution, we avoid computations involving lengthes.
|
|
|
|
*/
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_cond_broadcast(&data_cond);
|
2006-10-31 12:23:14 +01:00
|
|
|
if (!skip_lock)
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
void Relay_log_info::close_temporary_tables()
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
TABLE *table,*next;
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::close_temporary_tables");
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
for (table=save_temporary_tables ; table ; table=next)
|
|
|
|
{
|
|
|
|
next=table->next;
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
|
|
|
|
/* Reset in_use as the table may have been created by another thd */
|
|
|
|
table->in_use=0;
|
2006-10-31 12:23:14 +01:00
|
|
|
/*
|
|
|
|
Don't ask for disk deletion. For now, anyway they will be deleted when
|
|
|
|
slave restarts, but it is a better intention to not delete them.
|
|
|
|
*/
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("info", ("table: 0x%lx", (long) table));
|
2006-10-31 12:23:14 +01:00
|
|
|
close_temporary(table, 1, 0);
|
|
|
|
}
|
|
|
|
save_temporary_tables= 0;
|
|
|
|
slave_open_temp_tables= 0;
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
purge_relay_logs()
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
Assumes to have a run lock on rli and that no slave thread are running.
|
|
|
|
*/
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset,
|
2006-10-31 12:23:14 +01:00
|
|
|
const char** errmsg)
|
|
|
|
{
|
|
|
|
int error=0;
|
|
|
|
DBUG_ENTER("purge_relay_logs");
|
|
|
|
|
|
|
|
/*
|
|
|
|
Even if rli->inited==0, we still try to empty rli->master_log_* variables.
|
|
|
|
Indeed, rli->inited==0 does not imply that they already are empty.
|
|
|
|
It could be that slave's info initialization partly succeeded :
|
|
|
|
for example if relay-log.info existed but *relay-bin*.*
|
|
|
|
have been manually removed, init_relay_log_info reads the old
|
|
|
|
relay-log.info and fills rli->master_log_*, then init_relay_log_info
|
|
|
|
checks for the existence of the relay log, this fails and
|
|
|
|
init_relay_log_info leaves rli->inited to 0.
|
|
|
|
In that pathological case, rli->master_log_pos* will be properly reinited
|
|
|
|
at the next START SLAVE (as RESET SLAVE or CHANGE
|
|
|
|
MASTER, the callers of purge_relay_logs, will delete bogus *.info files
|
|
|
|
or replace them with correct files), however if the user does SHOW SLAVE
|
|
|
|
STATUS before START SLAVE, he will see old, confusing rli->master_log_*.
|
|
|
|
In other words, we reinit rli->master_log_* for SHOW SLAVE STATUS
|
|
|
|
to display fine in any case.
|
|
|
|
*/
|
|
|
|
|
|
|
|
rli->group_master_log_name[0]= 0;
|
|
|
|
rli->group_master_log_pos= 0;
|
|
|
|
|
|
|
|
if (!rli->inited)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info", ("rli->inited == 0"));
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(rli->slave_running == 0);
|
|
|
|
DBUG_ASSERT(rli->mi->slave_running == 0);
|
|
|
|
|
|
|
|
rli->slave_skip_counter=0;
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_lock(&rli->data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
we close the relay log fd possibly left open by the slave SQL thread,
|
|
|
|
to be able to delete it; the relay log fd possibly left open by the slave
|
|
|
|
I/O thread will be closed naturally in reset_logs() by the
|
|
|
|
close(LOG_CLOSE_TO_BE_OPENED) call
|
|
|
|
*/
|
|
|
|
if (rli->cur_log_fd >= 0)
|
|
|
|
{
|
|
|
|
end_io_cache(&rli->cache_buf);
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_file_close(rli->cur_log_fd, MYF(MY_WME));
|
2006-10-31 12:23:14 +01:00
|
|
|
rli->cur_log_fd= -1;
|
|
|
|
}
|
|
|
|
|
2013-08-23 14:02:13 +02:00
|
|
|
if (rli->relay_log.reset_logs(thd, !just_reset, NULL, 0))
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
*errmsg = "Failed during log reset";
|
|
|
|
error=1;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (!just_reset)
|
2012-09-28 20:22:24 +02:00
|
|
|
{
|
|
|
|
/* Save name of used relay log file */
|
2013-06-06 17:51:28 +02:00
|
|
|
strmake_buf(rli->group_relay_log_name, rli->relay_log.get_log_fname());
|
|
|
|
strmake_buf(rli->event_relay_log_name, rli->relay_log.get_log_fname());
|
2012-09-28 20:22:24 +02:00
|
|
|
rli->group_relay_log_pos= rli->event_relay_log_pos= BIN_LOG_HEADER_SIZE;
|
|
|
|
rli->log_space_total= 0;
|
|
|
|
|
|
|
|
if (count_relay_log_space(rli))
|
|
|
|
{
|
|
|
|
*errmsg= "Error counting relay log space";
|
|
|
|
error=1;
|
|
|
|
goto err;
|
|
|
|
}
|
2006-10-31 12:23:14 +01:00
|
|
|
error= init_relay_log_pos(rli, rli->group_relay_log_name,
|
|
|
|
rli->group_relay_log_pos,
|
|
|
|
0 /* do not need data lock */, errmsg, 0);
|
2012-09-28 20:22:24 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Ensure relay log names are not used */
|
|
|
|
rli->group_relay_log_name[0]= rli->event_relay_log_name[0]= 0;
|
|
|
|
}
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
err:
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
char buf[22];
|
|
|
|
#endif
|
|
|
|
DBUG_PRINT("info",("log_space_total: %s",llstr(rli->log_space_total,buf)));
|
2010-01-07 06:42:07 +01:00
|
|
|
mysql_mutex_unlock(&rli->data_lock);
|
2006-10-31 12:23:14 +01:00
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Check if condition stated in UNTIL clause of START SLAVE is reached.
|
|
|
|
SYNOPSYS
|
2007-08-16 07:37:50 +02:00
|
|
|
Relay_log_info::is_until_satisfied()
|
2008-02-27 18:46:06 +01:00
|
|
|
master_beg_pos position of the beginning of to be executed event
|
|
|
|
(not log_pos member of the event that points to the
|
|
|
|
beginning of the following event)
|
|
|
|
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
DESCRIPTION
|
|
|
|
Checks if UNTIL condition is reached. Uses caching result of last
|
|
|
|
comparison of current log file name and target log file name. So cached
|
|
|
|
value should be invalidated if current log file name changes
|
2007-08-16 07:37:50 +02:00
|
|
|
(see Relay_log_info::notify_... functions).
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
This caching is needed to avoid of expensive string comparisons and
|
|
|
|
strtol() conversions needed for log names comparison. We don't need to
|
|
|
|
compare them each time this function is called, we only need to do this
|
|
|
|
when current log name changes. If we have UNTIL_MASTER_POS condition we
|
2007-03-30 15:29:30 +02:00
|
|
|
need to do this only after Rotate_log_event::do_apply_event() (which is
|
2006-10-31 12:23:14 +01:00
|
|
|
rare, so caching gives real benifit), and if we have UNTIL_RELAY_POS
|
|
|
|
condition then we should invalidate cached comarison value after
|
|
|
|
inc_group_relay_log_pos() which called for each group of events (so we
|
|
|
|
have some benefit if we have something like queries that use
|
|
|
|
autoincrement or if we have transactions).
|
|
|
|
|
|
|
|
Should be called ONLY if until_condition != UNTIL_NONE !
|
|
|
|
RETURN VALUE
|
|
|
|
true - condition met or error happened (condition seems to have
|
|
|
|
bad log file name)
|
|
|
|
false - condition not met
|
|
|
|
*/
|
|
|
|
|
2009-12-14 17:32:22 +01:00
|
|
|
bool Relay_log_info::is_until_satisfied(THD *thd, Log_event *ev)
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
|
|
|
const char *log_name;
|
|
|
|
ulonglong log_pos;
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::is_until_satisfied");
|
2006-10-31 12:23:14 +01:00
|
|
|
|
2013-05-15 19:52:21 +02:00
|
|
|
DBUG_ASSERT(until_condition == UNTIL_MASTER_POS ||
|
|
|
|
until_condition == UNTIL_RELAY_POS);
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
if (until_condition == UNTIL_MASTER_POS)
|
|
|
|
{
|
2012-10-23 12:46:29 +02:00
|
|
|
if (ev && ev->server_id == (uint32) global_system_variables.server_id &&
|
|
|
|
!replicate_same_server_id)
|
2009-12-14 17:50:22 +01:00
|
|
|
DBUG_RETURN(FALSE);
|
2006-10-31 12:23:14 +01:00
|
|
|
log_name= group_master_log_name;
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
log_pos= ((!ev)? group_master_log_pos :
|
|
|
|
(get_flag(IN_TRANSACTION) || !ev->log_pos) ?
|
|
|
|
group_master_log_pos : ev->log_pos - ev->data_written);
|
2006-10-31 12:23:14 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{ /* until_condition == UNTIL_RELAY_POS */
|
|
|
|
log_name= group_relay_log_name;
|
|
|
|
log_pos= group_relay_log_pos;
|
|
|
|
}
|
|
|
|
|
2007-01-17 15:06:37 +01:00
|
|
|
#ifndef DBUG_OFF
|
|
|
|
{
|
|
|
|
char buf[32];
|
|
|
|
DBUG_PRINT("info", ("group_master_log_name='%s', group_master_log_pos=%s",
|
|
|
|
group_master_log_name, llstr(group_master_log_pos, buf)));
|
|
|
|
DBUG_PRINT("info", ("group_relay_log_name='%s', group_relay_log_pos=%s",
|
|
|
|
group_relay_log_name, llstr(group_relay_log_pos, buf)));
|
|
|
|
DBUG_PRINT("info", ("(%s) log_name='%s', log_pos=%s",
|
|
|
|
until_condition == UNTIL_MASTER_POS ? "master" : "relay",
|
|
|
|
log_name, llstr(log_pos, buf)));
|
|
|
|
DBUG_PRINT("info", ("(%s) until_log_name='%s', until_log_pos=%s",
|
|
|
|
until_condition == UNTIL_MASTER_POS ? "master" : "relay",
|
|
|
|
until_log_name, llstr(until_log_pos, buf)));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
if (until_log_names_cmp_result == UNTIL_LOG_NAMES_CMP_UNKNOWN)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
We have no cached comparison results so we should compare log names
|
|
|
|
and cache result.
|
|
|
|
If we are after RESET SLAVE, and the SQL slave thread has not processed
|
|
|
|
any event yet, it could be that group_master_log_name is "". In that case,
|
|
|
|
just wait for more events (as there is no sensible comparison to do).
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (*log_name)
|
|
|
|
{
|
|
|
|
const char *basename= log_name + dirname_length(log_name);
|
|
|
|
|
|
|
|
const char *q= (const char*)(fn_ext(basename)+1);
|
|
|
|
if (strncmp(basename, until_log_name, (int)(q-basename)) == 0)
|
|
|
|
{
|
|
|
|
/* Now compare extensions. */
|
|
|
|
char *q_end;
|
|
|
|
ulong log_name_extension= strtoul(q, &q_end, 10);
|
|
|
|
if (log_name_extension < until_log_name_extension)
|
|
|
|
until_log_names_cmp_result= UNTIL_LOG_NAMES_CMP_LESS;
|
|
|
|
else
|
|
|
|
until_log_names_cmp_result=
|
|
|
|
(log_name_extension > until_log_name_extension) ?
|
|
|
|
UNTIL_LOG_NAMES_CMP_GREATER : UNTIL_LOG_NAMES_CMP_EQUAL ;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Probably error so we aborting */
|
|
|
|
sql_print_error("Slave SQL thread is stopped because UNTIL "
|
|
|
|
"condition is bad.");
|
|
|
|
DBUG_RETURN(TRUE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
DBUG_RETURN(until_log_pos == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(((until_log_names_cmp_result == UNTIL_LOG_NAMES_CMP_EQUAL &&
|
|
|
|
log_pos >= until_log_pos) ||
|
|
|
|
until_log_names_cmp_result == UNTIL_LOG_NAMES_CMP_GREATER));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
void Relay_log_info::cached_charset_invalidate()
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::cached_charset_invalidate");
|
2006-10-31 12:23:14 +01:00
|
|
|
|
|
|
|
/* Full of zeroes means uninitialized. */
|
|
|
|
bzero(cached_charset, sizeof(cached_charset));
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
bool Relay_log_info::cached_charset_compare(char *charset) const
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
2007-08-16 07:37:50 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::cached_charset_compare");
|
2006-10-31 12:23:14 +01:00
|
|
|
|
Bug#53445: Build with -Wall and fix warnings that it generates
Apart strict-aliasing warnings, fix the remaining warnings
generated by GCC 4.4.4 -Wall and -Wextra flags.
One major source of warnings was the in-house function my_bcmp
which (unconventionally) took pointers to unsigned characters
as the byte sequences to be compared. Since my_bcmp and bcmp
are deprecated functions whose only difference with memcmp is
the return value, every use of the function is replaced with
memcmp as the special return value wasn't actually being used
by any caller.
There were also various other warnings, mostly due to type
mismatches, missing return values, missing prototypes, dead
code (unreachable) and ignored return values.
BUILD/SETUP.sh:
Remove flags that are implied by -Wall and -Wextra.
Do not warn about unused parameters in C++.
BUILD/check-cpu:
Print only the compiler version instead of verbose banner.
Although the option is gcc specific, the check was only
being used for GCC specific checks anyway.
client/mysql.cc:
bcmp is no longer defined.
client/mysqltest.cc:
Pass a string to function expecting a format string.
Replace use of bcmp with memcmp.
cmd-line-utils/readline/Makefile.am:
Always define _GNU_SOURCE when compiling GNU readline.
Required to make certain prototypes visible.
cmd-line-utils/readline/input.c:
Condition for the code to be meaningful.
configure.in:
Remove check for bcmp.
extra/comp_err.c:
Use appropriate type.
extra/replace.c:
Replace use of bcmp with memcmp.
extra/yassl/src/crypto_wrapper.cpp:
Do not ignore the return value of fgets. Retrieve the file
position if fgets succeed -- if it fails, the function will
bail out and return a error.
extra/yassl/taocrypt/include/blowfish.hpp:
Use a single array instead of accessing positions of the sbox_
through a subscript to pbox_.
extra/yassl/taocrypt/include/runtime.hpp:
One definition of such functions is enough.
extra/yassl/taocrypt/src/aes.cpp:
Avoid potentially ambiguous conditions.
extra/yassl/taocrypt/src/algebra.cpp:
Rename arguments to avoid shadowing related warnings.
extra/yassl/taocrypt/src/blowfish.cpp:
Avoid potentially ambiguous conditions.
extra/yassl/taocrypt/src/integer.cpp:
Do not define type within a anonymous union.
Use a variable to return a value instead of
leaving the result in a register -- compiler
does not know the logic inside the asm.
extra/yassl/taocrypt/src/misc.cpp:
Define handler for pure virtual functions.
Remove unused code.
extra/yassl/taocrypt/src/twofish.cpp:
Avoid potentially ambiguous conditions.
extra/yassl/testsuite/test.hpp:
Function must have C language linkage.
include/m_string.h:
Remove check which relied on bcmp being defined -- they weren't
being used as bcmp is only visible when _BSD_SOURCE is defined.
include/my_bitmap.h:
Remove bogus helpers which were used only in a few files and
were causing warnings about dead code.
include/my_global.h:
Due to G++ bug, always silence false-positive uninitialized
variables warnings when compiling C++ code with G++.
Remove bogus helper.
libmysql/Makefile.shared:
Remove built-in implementation of bcmp.
mysql-test/lib/My/SafeProcess/safe_process.cc:
Cast pid to largest possible type for a process identifier.
mysys/mf_loadpath.c:
Leave space of the ending nul.
mysys/mf_pack.c:
Replace bcmp with memcmp.
mysys/my_bitmap.c:
Dead code removal.
mysys/my_gethwaddr.c:
Remove unused variable.
mysys/my_getopt.c:
Silence bogus uninitialized variable warning.
Do not cast away the constant qualifier.
mysys/safemalloc.c:
Cast to expected type.
mysys/thr_lock.c:
Silence bogus uninitialized variable warning.
sql/field.cc:
Replace bogus helper with a more appropriate logic which is
used throughout the code.
sql/item.cc:
Remove bogus logical condition which always evaluates to TRUE.
sql/item_create.cc:
Simplify code to avoid signedness related warnings.
sql/log_event.cc:
Replace use of bcmp with memcmp.
No need to use helpers for simple bit operations.
sql/log_event_old.cc:
Replace bmove_align with memcpy.
sql/mysqld.cc:
Move use declaration of variable to the ifdef block where it
is used. Remove now-unnecessary casts and arguments.
sql/set_var.cc:
Replace bogus helpers with simple and classic bit operations.
sql/slave.cc:
Cast to expected type and silence bogus warning.
sql/sql_class.h:
Don't use enum values as bit flags, the supposed type safety is
bogus as the combined bit flags are not a value in the enumeration.
sql/udf_example.c:
Only declare variable when necessary.
sql/unireg.h:
Replace use of bmove_align with memcpy.
storage/innobase/os/os0file.c:
Silence bogus warning.
storage/myisam/mi_open.c:
Remove bogus cast, DBUG_DUMP expects a pointer to unsigned
char.
storage/myisam/mi_page.c:
Remove bogus cast, DBUG_DUMP expects a pointer to unsigned
char.
strings/bcmp.c:
Remove built-in bcmp.
strings/ctype-ucs2.c:
Silence bogus warning.
tests/mysql_client_test.c:
Use a appropriate type as expected by simple_command().
2010-07-02 20:30:47 +02:00
|
|
|
if (memcmp(cached_charset, charset, sizeof(cached_charset)))
|
2006-10-31 12:23:14 +01:00
|
|
|
{
|
2006-11-10 15:10:41 +01:00
|
|
|
memcpy(const_cast<char*>(cached_charset), charset, sizeof(cached_charset));
|
2006-10-31 12:23:14 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
void Relay_log_info::stmt_done(my_off_t event_master_log_pos,
|
2013-07-03 19:03:21 +02:00
|
|
|
time_t event_creation_time, THD *thd,
|
2013-09-13 15:09:57 +02:00
|
|
|
rpl_group_info *rgi)
|
2007-04-12 08:58:04 +02:00
|
|
|
{
|
2007-10-13 22:12:50 +02:00
|
|
|
#ifndef DBUG_OFF
|
|
|
|
extern uint debug_not_change_ts_if_art_event;
|
|
|
|
#endif
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
DBUG_ENTER("Relay_log_info::stmt_done");
|
2007-04-12 08:58:04 +02:00
|
|
|
|
2013-07-03 19:03:21 +02:00
|
|
|
DBUG_ASSERT(rgi->rli == this);
|
2007-04-12 08:58:04 +02:00
|
|
|
/*
|
|
|
|
If in a transaction, and if the slave supports transactions, just
|
|
|
|
inc_event_relay_log_pos(). We only have to check for OPTION_BEGIN
|
|
|
|
(not OPTION_NOT_AUTOCOMMIT) as transactions are logged with
|
|
|
|
BEGIN/COMMIT, not with SET AUTOCOMMIT= .
|
|
|
|
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
We can't use rgi->rli->get_flag(IN_TRANSACTION) here as OPTION_BEGIN
|
|
|
|
is also used for single row transactions.
|
|
|
|
|
2007-04-12 08:58:04 +02:00
|
|
|
CAUTION: opt_using_transactions means innodb || bdb ; suppose the
|
|
|
|
master supports InnoDB and BDB, but the slave supports only BDB,
|
|
|
|
problems will arise: - suppose an InnoDB table is created on the
|
|
|
|
master, - then it will be MyISAM on the slave - but as
|
|
|
|
opt_using_transactions is true, the slave will believe he is
|
|
|
|
transactional with the MyISAM table. And problems will come when
|
|
|
|
one does START SLAVE; STOP SLAVE; START SLAVE; (the slave will
|
|
|
|
resume at BEGIN whereas there has not been any rollback). This is
|
|
|
|
the problem of using opt_using_transactions instead of a finer
|
|
|
|
"does the slave support _transactional handler used on the
|
|
|
|
master_".
|
|
|
|
|
|
|
|
More generally, we'll have problems when a query mixes a
|
|
|
|
transactional handler and MyISAM and STOP SLAVE is issued in the
|
|
|
|
middle of the "transaction". START SLAVE will resume at BEGIN
|
|
|
|
while the MyISAM table has already been updated.
|
|
|
|
*/
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
if ((rgi->thd->variables.option_bits & OPTION_BEGIN) &&
|
|
|
|
opt_using_transactions)
|
2013-10-17 14:11:19 +02:00
|
|
|
rgi->inc_event_relay_log_pos();
|
2007-04-12 08:58:04 +02:00
|
|
|
else
|
|
|
|
{
|
2013-10-17 14:11:19 +02:00
|
|
|
inc_group_relay_log_pos(event_master_log_pos, rgi);
|
2013-07-03 19:03:21 +02:00
|
|
|
if (rpl_global_gtid_slave_state.record_and_update_gtid(thd, rgi))
|
2013-03-21 17:33:29 +01:00
|
|
|
{
|
|
|
|
report(WARNING_LEVEL, ER_CANNOT_UPDATE_GTID_STATE,
|
|
|
|
"Failed to update GTID state in %s.%s, slave state may become "
|
|
|
|
"inconsistent: %d: %s",
|
|
|
|
"mysql", rpl_gtid_slave_state_table_name.str,
|
|
|
|
thd->stmt_da->sql_errno(), thd->stmt_da->message());
|
|
|
|
/*
|
|
|
|
At this point we are not in a transaction (for example after DDL),
|
|
|
|
so we can not roll back. Anyway, normally updates to the slave
|
|
|
|
state table should not fail, and if they do, at least we made the
|
|
|
|
DBA aware of the problem in the error log.
|
|
|
|
*/
|
|
|
|
}
|
2013-03-28 13:03:51 +01:00
|
|
|
DBUG_EXECUTE_IF("inject_crash_before_flush_rli", DBUG_SUICIDE(););
|
2013-10-25 12:56:12 +02:00
|
|
|
if (mi->using_gtid == Master_info::USE_GTID_NO)
|
|
|
|
flush_relay_log_info(this);
|
2013-03-28 13:03:51 +01:00
|
|
|
DBUG_EXECUTE_IF("inject_crash_after_flush_rli", DBUG_SUICIDE(););
|
2007-04-12 08:58:04 +02:00
|
|
|
/*
|
|
|
|
Note that Rotate_log_event::do_apply_event() does not call this
|
|
|
|
function, so there is no chance that a fake rotate event resets
|
|
|
|
last_master_timestamp. Note that we update without mutex
|
|
|
|
(probably ok - except in some very rare cases, only consequence
|
|
|
|
is that value may take some time to display in
|
|
|
|
Seconds_Behind_Master - not critical).
|
2014-01-08 11:00:44 +01:00
|
|
|
|
|
|
|
In parallel replication, we take care to not set last_master_timestamp
|
|
|
|
backwards, in case of out-of-order calls here.
|
2007-04-12 08:58:04 +02:00
|
|
|
*/
|
2011-10-19 21:45:18 +02:00
|
|
|
if (!(event_creation_time == 0 &&
|
2014-01-08 11:00:44 +01:00
|
|
|
IF_DBUG(debug_not_change_ts_if_art_event > 0, 1)) &&
|
|
|
|
!(rgi->is_parallel_exec && event_creation_time <= last_master_timestamp)
|
|
|
|
)
|
2007-10-13 22:12:50 +02:00
|
|
|
last_master_timestamp= event_creation_time;
|
2007-04-12 08:58:04 +02:00
|
|
|
}
|
Bug#13693012: SLAVE CRASHING ON INSERT STATEMENT WITH MERGE TABLE
PROBLEM: After WL 4144, when using MyISAM Merge tables, the routine
open_and_lock_tables will append to the list of tables to lock, the
base tables that make up the MERGE table. This has two side-effects in
replication:
1. On the master side, we log additional table maps for the base
tables, since they appear in the list of locked tables, even
though we don't really use them at the slave.
2. On the slave side, when opening a MERGE table while applying a
ROW event, additional tables are appended to the list of tables
to lock.
Side-effect #1 is not harmful. It's just that when using MyISAM Merge
tables a few table maps more may be logged.
Side-effect #2, is harmful, because the list rli->tables_to_lock is an
extended structure from TABLE_LIST in which the extra fields are
filled from the table maps that are processed. Since
open_and_lock_tables appends tables to the list after all table map
events have been processed we end up with entries without
replication/table map data on them. Thus when trying to access that
info for these extra tables, the server will crash.
SOLUTION: We fix side-effect #2 by making sure that we access the
replication part of the structure for those in the list that were
accounted for when processing the correspondent table map events. All
in all, we never go beyond rli->tables_to_lock_count.
We also deploy an assertion when clearing rli->tables_to_lock, making
sure that the base tables are not in the list anymore (were closed in
close_thread_tables).
2012-02-24 17:07:43 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2007-02-26 17:44:55 +01:00
|
|
|
}
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
2013-03-18 15:09:36 +01:00
|
|
|
int
|
|
|
|
rpl_load_gtid_slave_state(THD *thd)
|
|
|
|
{
|
|
|
|
TABLE_LIST tlist;
|
|
|
|
TABLE *table;
|
|
|
|
bool table_opened= false;
|
|
|
|
bool table_scanned= false;
|
2013-06-21 21:23:24 +02:00
|
|
|
bool array_inited= false;
|
2013-03-18 15:09:36 +01:00
|
|
|
struct local_element { uint64 sub_id; rpl_gtid gtid; };
|
2013-06-21 21:23:24 +02:00
|
|
|
struct local_element tmp_entry, *entry;
|
2013-03-18 15:09:36 +01:00
|
|
|
HASH hash;
|
2013-06-21 21:23:24 +02:00
|
|
|
DYNAMIC_ARRAY array;
|
2013-03-18 15:09:36 +01:00
|
|
|
int err= 0;
|
|
|
|
uint32 i;
|
|
|
|
DBUG_ENTER("rpl_load_gtid_slave_state");
|
|
|
|
|
2014-02-07 19:15:28 +01:00
|
|
|
mysql_mutex_lock(&rpl_global_gtid_slave_state.LOCK_slave_state);
|
2013-03-18 15:09:36 +01:00
|
|
|
bool loaded= rpl_global_gtid_slave_state.loaded;
|
2014-02-07 19:15:28 +01:00
|
|
|
mysql_mutex_unlock(&rpl_global_gtid_slave_state.LOCK_slave_state);
|
2013-03-18 15:09:36 +01:00
|
|
|
if (loaded)
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
my_hash_init(&hash, &my_charset_bin, 32,
|
|
|
|
offsetof(local_element, gtid) + offsetof(rpl_gtid, domain_id),
|
|
|
|
sizeof(uint32), NULL, my_free, HASH_UNIQUE);
|
2013-06-21 21:23:24 +02:00
|
|
|
if ((err= my_init_dynamic_array(&array, sizeof(local_element), 0, 0, MYF(0))))
|
|
|
|
goto end;
|
|
|
|
array_inited= true;
|
2013-03-18 15:09:36 +01:00
|
|
|
|
2013-11-13 14:07:58 +01:00
|
|
|
mysql_reset_thd_for_next_command(thd);
|
2013-03-18 15:09:36 +01:00
|
|
|
|
|
|
|
tlist.init_one_table(STRING_WITH_LEN("mysql"),
|
|
|
|
rpl_gtid_slave_state_table_name.str,
|
|
|
|
rpl_gtid_slave_state_table_name.length,
|
|
|
|
NULL, TL_READ);
|
|
|
|
if ((err= open_and_lock_tables(thd, &tlist, FALSE, 0)))
|
|
|
|
goto end;
|
|
|
|
table_opened= true;
|
|
|
|
table= tlist.table;
|
|
|
|
|
|
|
|
if ((err= gtid_check_rpl_slave_state_table(table)))
|
|
|
|
goto end;
|
|
|
|
|
|
|
|
bitmap_set_all(table->read_set);
|
|
|
|
if ((err= table->file->ha_rnd_init_with_error(1)))
|
2013-06-03 07:41:38 +02:00
|
|
|
{
|
|
|
|
table->file->print_error(err, MYF(0));
|
2013-03-18 15:09:36 +01:00
|
|
|
goto end;
|
2013-06-03 07:41:38 +02:00
|
|
|
}
|
2013-03-18 15:09:36 +01:00
|
|
|
table_scanned= true;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
uint32 domain_id, server_id;
|
|
|
|
uint64 sub_id, seq_no;
|
|
|
|
uchar *rec;
|
|
|
|
|
|
|
|
if ((err= table->file->ha_rnd_next(table->record[0])))
|
|
|
|
{
|
|
|
|
if (err == HA_ERR_RECORD_DELETED)
|
|
|
|
continue;
|
|
|
|
else if (err == HA_ERR_END_OF_FILE)
|
|
|
|
break;
|
|
|
|
else
|
2013-06-03 07:41:38 +02:00
|
|
|
{
|
|
|
|
table->file->print_error(err, MYF(0));
|
2013-03-18 15:09:36 +01:00
|
|
|
goto end;
|
2013-06-03 07:41:38 +02:00
|
|
|
}
|
2013-03-18 15:09:36 +01:00
|
|
|
}
|
|
|
|
domain_id= (ulonglong)table->field[0]->val_int();
|
|
|
|
sub_id= (ulonglong)table->field[1]->val_int();
|
|
|
|
server_id= (ulonglong)table->field[2]->val_int();
|
|
|
|
seq_no= (ulonglong)table->field[3]->val_int();
|
|
|
|
DBUG_PRINT("info", ("Read slave state row: %u-%u-%lu sub_id=%lu\n",
|
|
|
|
(unsigned)domain_id, (unsigned)server_id,
|
|
|
|
(ulong)seq_no, (ulong)sub_id));
|
|
|
|
|
2013-06-21 21:23:24 +02:00
|
|
|
tmp_entry.sub_id= sub_id;
|
|
|
|
tmp_entry.gtid.domain_id= domain_id;
|
|
|
|
tmp_entry.gtid.server_id= server_id;
|
|
|
|
tmp_entry.gtid.seq_no= seq_no;
|
|
|
|
if ((err= insert_dynamic(&array, (uchar *)&tmp_entry)))
|
|
|
|
{
|
|
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2013-03-18 15:09:36 +01:00
|
|
|
if ((rec= my_hash_search(&hash, (const uchar *)&domain_id, 0)))
|
|
|
|
{
|
|
|
|
entry= (struct local_element *)rec;
|
|
|
|
if (entry->sub_id >= sub_id)
|
|
|
|
continue;
|
2013-03-28 13:03:51 +01:00
|
|
|
entry->sub_id= sub_id;
|
|
|
|
DBUG_ASSERT(entry->gtid.domain_id == domain_id);
|
|
|
|
entry->gtid.server_id= server_id;
|
|
|
|
entry->gtid.seq_no= seq_no;
|
2013-03-18 15:09:36 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!(entry= (struct local_element *)my_malloc(sizeof(*entry),
|
|
|
|
MYF(MY_WME))))
|
|
|
|
{
|
2013-06-03 07:41:38 +02:00
|
|
|
my_error(ER_OUTOFMEMORY, MYF(0), (int)sizeof(*entry));
|
2013-03-18 15:09:36 +01:00
|
|
|
err= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
2013-03-28 13:03:51 +01:00
|
|
|
entry->sub_id= sub_id;
|
|
|
|
entry->gtid.domain_id= domain_id;
|
|
|
|
entry->gtid.server_id= server_id;
|
|
|
|
entry->gtid.seq_no= seq_no;
|
2013-03-18 15:09:36 +01:00
|
|
|
if ((err= my_hash_insert(&hash, (uchar *)entry)))
|
|
|
|
{
|
|
|
|
my_free(entry);
|
2013-06-03 07:41:38 +02:00
|
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
2013-03-18 15:09:36 +01:00
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-07 19:15:28 +01:00
|
|
|
mysql_mutex_lock(&rpl_global_gtid_slave_state.LOCK_slave_state);
|
2013-06-03 07:41:38 +02:00
|
|
|
if (rpl_global_gtid_slave_state.loaded)
|
|
|
|
{
|
2014-02-07 19:15:28 +01:00
|
|
|
mysql_mutex_unlock(&rpl_global_gtid_slave_state.LOCK_slave_state);
|
2013-06-03 07:41:38 +02:00
|
|
|
goto end;
|
|
|
|
}
|
2013-06-21 21:23:24 +02:00
|
|
|
|
|
|
|
for (i= 0; i < array.elements; ++i)
|
2013-03-18 15:09:36 +01:00
|
|
|
{
|
2013-06-21 21:23:24 +02:00
|
|
|
get_dynamic(&array, (uchar *)&tmp_entry, i);
|
|
|
|
if ((err= rpl_global_gtid_slave_state.update(tmp_entry.gtid.domain_id,
|
|
|
|
tmp_entry.gtid.server_id,
|
|
|
|
tmp_entry.sub_id,
|
|
|
|
tmp_entry.gtid.seq_no)))
|
2013-03-18 15:09:36 +01:00
|
|
|
{
|
2014-02-07 19:15:28 +01:00
|
|
|
mysql_mutex_unlock(&rpl_global_gtid_slave_state.LOCK_slave_state);
|
2013-06-03 07:41:38 +02:00
|
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
2013-03-18 15:09:36 +01:00
|
|
|
goto end;
|
|
|
|
}
|
2013-06-21 21:23:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i= 0; i < hash.records; ++i)
|
|
|
|
{
|
|
|
|
entry= (struct local_element *)my_hash_element(&hash, i);
|
2013-05-28 13:28:31 +02:00
|
|
|
if (opt_bin_log &&
|
|
|
|
mysql_bin_log.bump_seq_no_counter_if_needed(entry->gtid.domain_id,
|
|
|
|
entry->gtid.seq_no))
|
|
|
|
{
|
2014-02-07 19:15:28 +01:00
|
|
|
mysql_mutex_unlock(&rpl_global_gtid_slave_state.LOCK_slave_state);
|
2013-06-03 07:41:38 +02:00
|
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
2013-05-28 13:28:31 +02:00
|
|
|
goto end;
|
|
|
|
}
|
2013-03-18 15:09:36 +01:00
|
|
|
}
|
2013-06-21 21:23:24 +02:00
|
|
|
|
2013-03-18 15:09:36 +01:00
|
|
|
rpl_global_gtid_slave_state.loaded= true;
|
2014-02-07 19:15:28 +01:00
|
|
|
mysql_mutex_unlock(&rpl_global_gtid_slave_state.LOCK_slave_state);
|
2013-03-18 15:09:36 +01:00
|
|
|
|
|
|
|
err= 0; /* Clear HA_ERR_END_OF_FILE */
|
|
|
|
|
|
|
|
end:
|
|
|
|
if (table_scanned)
|
|
|
|
{
|
|
|
|
table->file->ha_index_or_rnd_end();
|
|
|
|
ha_commit_trans(thd, FALSE);
|
|
|
|
ha_commit_trans(thd, TRUE);
|
|
|
|
}
|
|
|
|
if (table_opened)
|
|
|
|
{
|
|
|
|
close_thread_tables(thd);
|
|
|
|
thd->mdl_context.release_transactional_locks();
|
|
|
|
}
|
2013-06-21 21:23:24 +02:00
|
|
|
if (array_inited)
|
|
|
|
delete_dynamic(&array);
|
2013-03-18 15:09:36 +01:00
|
|
|
my_hash_free(&hash);
|
|
|
|
DBUG_RETURN(err);
|
|
|
|
}
|
|
|
|
|
2013-07-03 13:46:33 +02:00
|
|
|
|
MDEV-5657: Parallel replication.
Clean up and improve the parallel implementation code, mainly related to
scheduling of work to threads and handling of stop and errors.
Fix a lot of bugs in various corner cases that could lead to crashes or
corruption.
Fix that a single replication domain could easily grab all worker threads and
stall all other domains; now a configuration variable
--slave-domain-parallel-threads allows to limit the number of
workers.
Allow next event group to start as soon as previous group begins the commit
phase (as opposed to when it ends it); this allows multiple event groups on
the slave to participate in group commit, even when no other opportunities for
parallelism are available.
Various fixes:
- Fix some races in the rpl.rpl_parallel test case.
- Fix an old incorrect assertion in Log_event iocache read.
- Fix repeated malloc/free of wait_for_commit and rpl_group_info objects.
- Simplify wait_for_commit wakeup logic.
- Fix one case in queue_for_group_commit() where killing one thread would
fail to correctly signal the error to the next, causing loss of the
transaction after slave restart.
- Fix leaking of pthreads (and their allocated stack) due to missing
PTHREAD_CREATE_DETACHED attribute.
- Fix how one batch of group-committed transactions wait for the previous
batch before starting to execute themselves. The old code had a very
complex scheduling where the first transaction was handled differently,
with subtle bugs in corner cases. Now each event group is always scheduled
for a new worker (in a round-robin fashion amongst available workers).
Keep a count of how many transactions have started to commit, and wait for
that counter to reach the appropriate value.
- Fix slave stop to wait for all workers to actually complete processing;
before, the wait was for update of last_committed_sub_id, which happens a
bit earlier, and could leave worker threads potentially accessing bits of
the replication state that is no longer valid after slave stop.
- Fix a couple of places where the test suite would kill a thread waiting
inside enter_cond() in connection with debug_sync; debug_sync + kill can
crash in rare cases due to a race with mysys_var_current_mutex in this
case.
- Fix some corner cases where we had enter_cond() but no exit_cond().
- Fix that we could get failure in wait_for_prior_commit() but forget to flag
the error with my_error().
- Fix slave stop (both for normal stop and stop due to error). Now, at stop
we pick a specific safe point (in terms of event groups executed) and make
sure that all event groups before that point are executed to completion,
and that no event group after start executing; this ensures a safe place to
restart replication, even for non-transactional stuff/DDL. In error stop,
make sure that all prior event groups are allowed to execute to completion,
and that any later event groups that have started are rolled back, if
possible. The old code could leave eg. T1 and T3 committed but T2 not, or
it could even leave half a transaction not rolled back in some random
worker, which would cause big problems when that worker was later reused
after slave restart.
- Fix the accounting of amount of events queued for one worker. Before, the
amount was reduced immediately as soon as the events were dequeued (which
happens all at once); this allowed twice the amount of events to be queued
in memory for each single worker, which is not what users would expect.
- Fix that an error set during execution of one event was sometimes not
cleared before executing the next, causing problems with the error
reporting.
- Fix incorrect handling of thd->killed in worker threads.
2014-02-26 15:02:09 +01:00
|
|
|
void
|
|
|
|
rpl_group_info::reinit(Relay_log_info *rli)
|
|
|
|
{
|
|
|
|
this->rli= rli;
|
|
|
|
tables_to_lock= NULL;
|
|
|
|
tables_to_lock_count= 0;
|
|
|
|
trans_retries= 0;
|
|
|
|
last_event_start_time= 0;
|
|
|
|
is_error= false;
|
|
|
|
row_stmt_start_timestamp= 0;
|
|
|
|
long_find_row_note_printed= false;
|
|
|
|
did_mark_start_commit= false;
|
|
|
|
commit_orderer.reinit();
|
|
|
|
}
|
|
|
|
|
|
|
|
rpl_group_info::rpl_group_info(Relay_log_info *rli)
|
|
|
|
: thd(0), gtid_sub_id(0), wait_commit_sub_id(0),
|
|
|
|
wait_commit_group_info(0), parallel_entry(0),
|
|
|
|
deferred_events(NULL), m_annotate_event(0), is_parallel_exec(false)
|
2013-07-03 13:46:33 +02:00
|
|
|
{
|
MDEV-5657: Parallel replication.
Clean up and improve the parallel implementation code, mainly related to
scheduling of work to threads and handling of stop and errors.
Fix a lot of bugs in various corner cases that could lead to crashes or
corruption.
Fix that a single replication domain could easily grab all worker threads and
stall all other domains; now a configuration variable
--slave-domain-parallel-threads allows to limit the number of
workers.
Allow next event group to start as soon as previous group begins the commit
phase (as opposed to when it ends it); this allows multiple event groups on
the slave to participate in group commit, even when no other opportunities for
parallelism are available.
Various fixes:
- Fix some races in the rpl.rpl_parallel test case.
- Fix an old incorrect assertion in Log_event iocache read.
- Fix repeated malloc/free of wait_for_commit and rpl_group_info objects.
- Simplify wait_for_commit wakeup logic.
- Fix one case in queue_for_group_commit() where killing one thread would
fail to correctly signal the error to the next, causing loss of the
transaction after slave restart.
- Fix leaking of pthreads (and their allocated stack) due to missing
PTHREAD_CREATE_DETACHED attribute.
- Fix how one batch of group-committed transactions wait for the previous
batch before starting to execute themselves. The old code had a very
complex scheduling where the first transaction was handled differently,
with subtle bugs in corner cases. Now each event group is always scheduled
for a new worker (in a round-robin fashion amongst available workers).
Keep a count of how many transactions have started to commit, and wait for
that counter to reach the appropriate value.
- Fix slave stop to wait for all workers to actually complete processing;
before, the wait was for update of last_committed_sub_id, which happens a
bit earlier, and could leave worker threads potentially accessing bits of
the replication state that is no longer valid after slave stop.
- Fix a couple of places where the test suite would kill a thread waiting
inside enter_cond() in connection with debug_sync; debug_sync + kill can
crash in rare cases due to a race with mysys_var_current_mutex in this
case.
- Fix some corner cases where we had enter_cond() but no exit_cond().
- Fix that we could get failure in wait_for_prior_commit() but forget to flag
the error with my_error().
- Fix slave stop (both for normal stop and stop due to error). Now, at stop
we pick a specific safe point (in terms of event groups executed) and make
sure that all event groups before that point are executed to completion,
and that no event group after start executing; this ensures a safe place to
restart replication, even for non-transactional stuff/DDL. In error stop,
make sure that all prior event groups are allowed to execute to completion,
and that any later event groups that have started are rolled back, if
possible. The old code could leave eg. T1 and T3 committed but T2 not, or
it could even leave half a transaction not rolled back in some random
worker, which would cause big problems when that worker was later reused
after slave restart.
- Fix the accounting of amount of events queued for one worker. Before, the
amount was reduced immediately as soon as the events were dequeued (which
happens all at once); this allowed twice the amount of events to be queued
in memory for each single worker, which is not what users would expect.
- Fix that an error set during execution of one event was sometimes not
cleared before executing the next, causing problems with the error
reporting.
- Fix incorrect handling of thd->killed in worker threads.
2014-02-26 15:02:09 +01:00
|
|
|
reinit(rli);
|
2013-07-03 13:46:33 +02:00
|
|
|
bzero(¤t_gtid, sizeof(current_gtid));
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
mysql_mutex_init(key_rpl_group_info_sleep_lock, &sleep_lock,
|
|
|
|
MY_MUTEX_INIT_FAST);
|
|
|
|
mysql_cond_init(key_rpl_group_info_sleep_cond, &sleep_cond, NULL);
|
2013-07-03 13:46:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-07-12 14:52:05 +02:00
|
|
|
rpl_group_info::~rpl_group_info()
|
|
|
|
{
|
|
|
|
free_annotate_event();
|
2013-11-08 15:14:18 +01:00
|
|
|
delete deferred_events;
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
mysql_mutex_destroy(&sleep_lock);
|
|
|
|
mysql_cond_destroy(&sleep_cond);
|
2013-07-12 14:52:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-07-03 13:46:33 +02:00
|
|
|
int
|
|
|
|
event_group_new_gtid(rpl_group_info *rgi, Gtid_log_event *gev)
|
|
|
|
{
|
2013-11-01 09:17:06 +01:00
|
|
|
uint64 sub_id= rpl_global_gtid_slave_state.next_sub_id(gev->domain_id);
|
2013-07-03 13:46:33 +02:00
|
|
|
if (!sub_id)
|
|
|
|
{
|
2013-09-13 15:09:57 +02:00
|
|
|
/* Out of memory caused hash insertion to fail. */
|
2013-07-03 13:46:33 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
rgi->gtid_sub_id= sub_id;
|
|
|
|
rgi->current_gtid.server_id= gev->server_id;
|
|
|
|
rgi->current_gtid.domain_id= gev->domain_id;
|
|
|
|
rgi->current_gtid.seq_no= gev->seq_no;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-04 13:17:01 +02:00
|
|
|
|
|
|
|
void
|
2013-07-12 14:42:48 +02:00
|
|
|
delete_or_keep_event_post_apply(rpl_group_info *rgi,
|
2013-07-04 13:17:01 +02:00
|
|
|
Log_event_type typ, Log_event *ev)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
ToDo: This needs to work on rpl_group_info, not Relay_log_info, to be
|
|
|
|
thread-safe for parallel replication.
|
|
|
|
*/
|
|
|
|
|
|
|
|
switch (typ) {
|
|
|
|
case FORMAT_DESCRIPTION_EVENT:
|
|
|
|
/*
|
|
|
|
Format_description_log_event should not be deleted because it
|
|
|
|
will be used to read info about the relay log's format;
|
|
|
|
it will be deleted when the SQL thread does not need it,
|
|
|
|
i.e. when this thread terminates.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
case ANNOTATE_ROWS_EVENT:
|
|
|
|
/*
|
|
|
|
Annotate_rows event should not be deleted because after it has
|
|
|
|
been applied, thd->query points to the string inside this event.
|
|
|
|
The thd->query will be used to generate new Annotate_rows event
|
|
|
|
during applying the subsequent Rows events.
|
|
|
|
*/
|
2013-07-12 14:52:05 +02:00
|
|
|
rgi->set_annotate_event((Annotate_rows_log_event*) ev);
|
2013-07-04 13:17:01 +02:00
|
|
|
break;
|
|
|
|
case DELETE_ROWS_EVENT:
|
|
|
|
case UPDATE_ROWS_EVENT:
|
|
|
|
case WRITE_ROWS_EVENT:
|
|
|
|
/*
|
|
|
|
After the last Rows event has been applied, the saved Annotate_rows
|
|
|
|
event (if any) is not needed anymore and can be deleted.
|
|
|
|
*/
|
|
|
|
if (((Rows_log_event*)ev)->get_flags(Rows_log_event::STMT_END_F))
|
2013-07-12 14:52:05 +02:00
|
|
|
rgi->free_annotate_event();
|
2013-07-04 13:17:01 +02:00
|
|
|
/* fall through */
|
|
|
|
default:
|
|
|
|
DBUG_PRINT("info", ("Deleting the event after it has been executed"));
|
2013-07-12 14:42:48 +02:00
|
|
|
if (!rgi->is_deferred_event(ev))
|
2013-07-04 13:17:01 +02:00
|
|
|
delete ev;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-16 14:33:49 +02:00
|
|
|
|
|
|
|
void rpl_group_info::cleanup_context(THD *thd, bool error)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Relay_log_info::cleanup_context");
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
DBUG_PRINT("enter", ("error: %d", (int) error));
|
|
|
|
|
2013-09-16 14:33:49 +02:00
|
|
|
DBUG_ASSERT(this->thd == thd);
|
|
|
|
/*
|
|
|
|
1) Instances of Table_map_log_event, if ::do_apply_event() was called on them,
|
|
|
|
may have opened tables, which we cannot be sure have been closed (because
|
|
|
|
maybe the Rows_log_event have not been found or will not be, because slave
|
|
|
|
SQL thread is stopping, or relay log has a missing tail etc). So we close
|
|
|
|
all thread's tables. And so the table mappings have to be cancelled.
|
|
|
|
2) Rows_log_event::do_apply_event() may even have started statements or
|
|
|
|
transactions on them, which we need to rollback in case of error.
|
|
|
|
3) If finding a Format_description_log_event after a BEGIN, we also need
|
|
|
|
to rollback before continuing with the next events.
|
|
|
|
4) so we need this "context cleanup" function.
|
|
|
|
*/
|
|
|
|
if (error)
|
|
|
|
{
|
|
|
|
trans_rollback_stmt(thd); // if a "statement transaction"
|
|
|
|
trans_rollback(thd); // if a "real transaction"
|
|
|
|
}
|
|
|
|
m_table_map.clear_tables();
|
|
|
|
slave_close_thread_tables(thd);
|
|
|
|
if (error)
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
{
|
2013-09-16 14:33:49 +02:00
|
|
|
thd->mdl_context.release_transactional_locks();
|
Fixes for parallel slave:
- Made slaves temporary table multi-thread slave safe by adding mutex around save_temporary_table usage.
- rli->save_temporary_tables is the active list of all used temporary tables
- This is copied to THD->temporary_tables when temporary tables are opened and updated when temporary tables are closed
- Added THD->lock_temporary_tables() and THD->unlock_temporary_tables() to simplify this.
- Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code.
- Added is_part_of_group() to mark functions that are part of the next function. This replaces setting IN_STMT when events are executed.
- Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
- If slave_skip_counter is set run things in single threaded mode. This simplifies code for skipping events.
- Updating state of relay log (IN_STMT and IN_TRANSACTION) is moved to one single function: update_state_of_relay_log()
We can't use OPTION_BEGIN to check for the state anymore as the sql_driver and sql execution threads may be different.
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts
is_in_group() is now independent of state of executed transaction.
- Reset thd->transaction.all.modified_non_trans_table() if we did set it for single table row events.
This was mainly for keeping the flag as documented.
- Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
- Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
- Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
- Changed some functions to take rpl_group_info instead of Relay_log_info to make them multi-slave safe and to simplify usage
- do_shall_skip()
- continue_group()
- sql_slave_killed()
- next_event()
- Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
- set_thd_in_use_temporary_tables() removed as in_use is set on usage
- Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
- In open_table() reuse code from find_temporary_table()
Other things:
- More DBUG statements
- Fixed the rpl_incident.test can be run with --debug
- More comments
- Disabled not used function rpl_connect_master()
mysql-test/suite/perfschema/r/all_instances.result:
Moved sleep_lock and sleep_cond to rpl_group_info
mysql-test/suite/rpl/r/rpl_incident.result:
Updated result
mysql-test/suite/rpl/t/rpl_incident-master.opt:
Not needed anymore
mysql-test/suite/rpl/t/rpl_incident.test:
Fixed that test can be run with --debug
sql/handler.cc:
More DBUG_PRINT
sql/log.cc:
More comments
sql/log_event.cc:
Added DBUG statements
do_shall_skip(), continue_group() now takes rpl_group_info param
Use is_begin(), is_commit() and is_rollback() functions instead of inspecting query string
We don't have set slaves temporary tables 'in_use' as this is now done when tables are opened.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
Use IN_TRANSACTION flag to test state of relay log.
In rows_event_stmt_cleanup() reset thd->transaction.all.modified_non_trans_table if we had set this before.
sql/log_event.h:
do_shall_skip(), continue_group() now takes rpl_group_info param
Added is_part_of_group() to mark events that are part of the next event. This replaces setting IN_STMT when events are executed.
Added is_begin(), is_commit() and is_rollback() functions to Query_log_event to simplify code.
sql/log_event_old.cc:
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/log_event_old.h:
Added is_part_of_group() to mark events that are part of the next event.
do_shall_skip(), continue_group() now takes rpl_group_info param
sql/mysqld.cc:
Changed slave_open_temp_tables to uint32 to be able to use atomic operators on it.
Relay_log_info::sleep_lock -> Rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> Rpl_group_info::sleep_cond
sql/mysqld.h:
Updated types and names
sql/rpl_gtid.cc:
More DBUG
sql/rpl_parallel.cc:
Updated TODO section
Set thd for event that is execution
Use new is_begin(), is_commit() and is_rollback() functions.
More comments
sql/rpl_rli.cc:
sql_thd -> sql_driver_thd
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Clear IN_STMT and IN_TRANSACTION in init_relay_log_pos() and Relay_log_info::cleanup_context() to ensure the flags doesn't survive slave restarts.
Reset table->in_use for temporary tables as the table may have been used by another THD.
Use IN_TRANSACTION instead of OPTION_BEGIN to check state of relay log.
Removed IN_STMT flag setting. This is now done in update_state_of_relay_log()
sql/rpl_rli.h:
Changed relay log state flags to bit masks instead of bit positions (most other code we have uses bit masks)
Added IN_TRANSACTION to mark if we are in a BEGIN ... COMMIT section.
save_temporary_tables is now thread safe
Relay_log_info::sleep_lock -> rpl_group_info::sleep_lock
Relay_log_info::sleep_cond -> rpl_group_info::sleep_cond
Relay_log_info->sql_thd renamed to Relay_log_info->sql_driver_thd to avoid wrong usage for merged code
is_in_group() is now independent of state of executed transaction.
sql/slave.cc:
Simplifed arguments to io_salve_killed(), sql_slave_killed() and check_io_slave_killed(); No reason to supply THD as this is part of the given structure.
set_thd_in_use_temporary_tables() removed as in_use is set on usage in sql_base.cc
sql_thd -> sql_driver_thd
More DBUG
Added update_state_of_relay_log() which will calculate the IN_STMT and IN_TRANSACTION state of the relay log after the current element is executed.
If slave_skip_counter is set run things in single threaded mode.
Simplifed arguments to io_salve_killed(), check_io_slave_killed() and sql_slave_killed(); No reason to supply THD as this is part of the given structure.
Added information to thd_proc_info() which thread is waiting for slave mutex to exit.
Disabled not used function rpl_connect_master()
Updated argument to next_event()
sql/sql_base.cc:
Added mutex around usage of slave's temporary tables. The active list is always kept up to date in sql->rgi_slave->save_temporary_tables.
Clear thd->temporary_tables after query (safety)
More DBUG
When using temporary table, set table->in_use to current thd as the THD may be different for slave threads.
Some code is ifdef:ed with REMOVE_AFTER_MERGE_WITH_10 as the given code in 10.0 is not yet in this tree.
In open_table() reuse code from find_temporary_table()
sql/sql_binlog.cc:
rli->sql_thd -> rli->sql_driver_thd
Remove duplicate setting of rgi->rli
sql/sql_class.cc:
Added helper functions rgi_lock_temporary_tables() and rgi_unlock_temporary_tables()
Would have been nicer to have these inline, but there was no easy way to do that
sql/sql_class.h:
Added functions to protect slaves temporary tables
sql/sql_parse.cc:
Added DBUG_PRINT
sql/transaction.cc:
Added comment
2013-10-13 23:24:05 +02:00
|
|
|
|
|
|
|
if (thd == rli->sql_driver_thd)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Reset flags. This is needed to handle incident events and errors in
|
|
|
|
the relay log noticed by the sql driver thread.
|
|
|
|
*/
|
|
|
|
rli->clear_flag(Relay_log_info::IN_STMT);
|
|
|
|
rli->clear_flag(Relay_log_info::IN_TRANSACTION);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-16 14:33:49 +02:00
|
|
|
/*
|
|
|
|
Cleanup for the flags that have been set at do_apply_event.
|
|
|
|
*/
|
|
|
|
thd->variables.option_bits&= ~OPTION_NO_FOREIGN_KEY_CHECKS;
|
|
|
|
thd->variables.option_bits&= ~OPTION_RELAXED_UNIQUE_CHECKS;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Reset state related to long_find_row notes in the error log:
|
|
|
|
- timestamp
|
|
|
|
- flag that decides whether the slave prints or not
|
|
|
|
*/
|
2013-10-14 23:17:16 +02:00
|
|
|
reset_row_stmt_start_timestamp();
|
|
|
|
unset_long_find_row_note_printed();
|
2013-09-16 14:33:49 +02:00
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void rpl_group_info::clear_tables_to_lock()
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Relay_log_info::clear_tables_to_lock()");
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
/**
|
|
|
|
When replicating in RBR and MyISAM Merge tables are involved
|
|
|
|
open_and_lock_tables (called in do_apply_event) appends the
|
|
|
|
base tables to the list of tables_to_lock. Then these are
|
|
|
|
removed from the list in close_thread_tables (which is called
|
|
|
|
before we reach this point).
|
|
|
|
|
|
|
|
This assertion just confirms that we get no surprises at this
|
|
|
|
point.
|
|
|
|
*/
|
|
|
|
uint i=0;
|
|
|
|
for (TABLE_LIST *ptr= tables_to_lock ; ptr ; ptr= ptr->next_global, i++) ;
|
|
|
|
DBUG_ASSERT(i == tables_to_lock_count);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
while (tables_to_lock)
|
|
|
|
{
|
|
|
|
uchar* to_free= reinterpret_cast<uchar*>(tables_to_lock);
|
|
|
|
if (tables_to_lock->m_tabledef_valid)
|
|
|
|
{
|
|
|
|
tables_to_lock->m_tabledef.table_def::~table_def();
|
|
|
|
tables_to_lock->m_tabledef_valid= FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
If blob fields were used during conversion of field values
|
|
|
|
from the master table into the slave table, then we need to
|
|
|
|
free the memory used temporarily to store their values before
|
|
|
|
copying into the slave's table.
|
|
|
|
*/
|
|
|
|
if (tables_to_lock->m_conv_table)
|
|
|
|
free_blobs(tables_to_lock->m_conv_table);
|
|
|
|
|
|
|
|
tables_to_lock=
|
|
|
|
static_cast<RPL_TABLE_LIST*>(tables_to_lock->next_global);
|
|
|
|
tables_to_lock_count--;
|
|
|
|
my_free(to_free);
|
|
|
|
}
|
|
|
|
DBUG_ASSERT(tables_to_lock == NULL && tables_to_lock_count == 0);
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void rpl_group_info::slave_close_thread_tables(THD *thd)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("Relay_log_info::slave_close_thread_tables(THD *thd)");
|
|
|
|
thd->stmt_da->can_overwrite_status= TRUE;
|
|
|
|
thd->is_error() ? trans_rollback_stmt(thd) : trans_commit_stmt(thd);
|
|
|
|
thd->stmt_da->can_overwrite_status= FALSE;
|
|
|
|
|
|
|
|
close_thread_tables(thd);
|
|
|
|
/*
|
2013-08-20 11:12:34 +02:00
|
|
|
- If transaction rollback was requested due to deadlock
|
|
|
|
perform it and release metadata locks.
|
2013-09-16 14:33:49 +02:00
|
|
|
- If inside a multi-statement transaction,
|
|
|
|
defer the release of metadata locks until the current
|
|
|
|
transaction is either committed or rolled back. This prevents
|
|
|
|
other statements from modifying the table for the entire
|
|
|
|
duration of this transaction. This provides commit ordering
|
|
|
|
and guarantees serializability across multiple transactions.
|
|
|
|
- If in autocommit mode, or outside a transactional context,
|
|
|
|
automatically release metadata locks of the current statement.
|
|
|
|
*/
|
2013-08-20 11:12:34 +02:00
|
|
|
if (thd->transaction_rollback_request)
|
|
|
|
{
|
|
|
|
trans_rollback_implicit(thd);
|
|
|
|
thd->mdl_context.release_transactional_locks();
|
|
|
|
}
|
|
|
|
else if (! thd->in_multi_stmt_transaction_mode())
|
2013-09-16 14:33:49 +02:00
|
|
|
thd->mdl_context.release_transactional_locks();
|
|
|
|
else
|
|
|
|
thd->mdl_context.release_statement_locks();
|
|
|
|
|
|
|
|
clear_tables_to_lock();
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
MDEV-5657: Parallel replication.
Clean up and improve the parallel implementation code, mainly related to
scheduling of work to threads and handling of stop and errors.
Fix a lot of bugs in various corner cases that could lead to crashes or
corruption.
Fix that a single replication domain could easily grab all worker threads and
stall all other domains; now a configuration variable
--slave-domain-parallel-threads allows to limit the number of
workers.
Allow next event group to start as soon as previous group begins the commit
phase (as opposed to when it ends it); this allows multiple event groups on
the slave to participate in group commit, even when no other opportunities for
parallelism are available.
Various fixes:
- Fix some races in the rpl.rpl_parallel test case.
- Fix an old incorrect assertion in Log_event iocache read.
- Fix repeated malloc/free of wait_for_commit and rpl_group_info objects.
- Simplify wait_for_commit wakeup logic.
- Fix one case in queue_for_group_commit() where killing one thread would
fail to correctly signal the error to the next, causing loss of the
transaction after slave restart.
- Fix leaking of pthreads (and their allocated stack) due to missing
PTHREAD_CREATE_DETACHED attribute.
- Fix how one batch of group-committed transactions wait for the previous
batch before starting to execute themselves. The old code had a very
complex scheduling where the first transaction was handled differently,
with subtle bugs in corner cases. Now each event group is always scheduled
for a new worker (in a round-robin fashion amongst available workers).
Keep a count of how many transactions have started to commit, and wait for
that counter to reach the appropriate value.
- Fix slave stop to wait for all workers to actually complete processing;
before, the wait was for update of last_committed_sub_id, which happens a
bit earlier, and could leave worker threads potentially accessing bits of
the replication state that is no longer valid after slave stop.
- Fix a couple of places where the test suite would kill a thread waiting
inside enter_cond() in connection with debug_sync; debug_sync + kill can
crash in rare cases due to a race with mysys_var_current_mutex in this
case.
- Fix some corner cases where we had enter_cond() but no exit_cond().
- Fix that we could get failure in wait_for_prior_commit() but forget to flag
the error with my_error().
- Fix slave stop (both for normal stop and stop due to error). Now, at stop
we pick a specific safe point (in terms of event groups executed) and make
sure that all event groups before that point are executed to completion,
and that no event group after start executing; this ensures a safe place to
restart replication, even for non-transactional stuff/DDL. In error stop,
make sure that all prior event groups are allowed to execute to completion,
and that any later event groups that have started are rolled back, if
possible. The old code could leave eg. T1 and T3 committed but T2 not, or
it could even leave half a transaction not rolled back in some random
worker, which would cause big problems when that worker was later reused
after slave restart.
- Fix the accounting of amount of events queued for one worker. Before, the
amount was reduced immediately as soon as the events were dequeued (which
happens all at once); this allowed twice the amount of events to be queued
in memory for each single worker, which is not what users would expect.
- Fix that an error set during execution of one event was sometimes not
cleared before executing the next, causing problems with the error
reporting.
- Fix incorrect handling of thd->killed in worker threads.
2014-02-26 15:02:09 +01:00
|
|
|
|
|
|
|
static void
|
|
|
|
mark_start_commit_inner(rpl_parallel_entry *e, group_commit_orderer *gco)
|
|
|
|
{
|
|
|
|
uint64 count= ++e->count_committing_event_groups;
|
|
|
|
if (gco->next_gco && gco->next_gco->wait_count == count)
|
|
|
|
mysql_cond_broadcast(&gco->next_gco->COND_group_commit_orderer);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
rpl_group_info::mark_start_commit_no_lock()
|
|
|
|
{
|
|
|
|
if (did_mark_start_commit)
|
|
|
|
return;
|
|
|
|
mark_start_commit_inner(parallel_entry, gco);
|
|
|
|
did_mark_start_commit= true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
rpl_group_info::mark_start_commit()
|
|
|
|
{
|
|
|
|
rpl_parallel_entry *e;
|
|
|
|
|
|
|
|
if (did_mark_start_commit)
|
|
|
|
return;
|
|
|
|
|
|
|
|
e= this->parallel_entry;
|
|
|
|
mysql_mutex_lock(&e->LOCK_parallel_entry);
|
|
|
|
mark_start_commit_inner(e, gco);
|
|
|
|
mysql_mutex_unlock(&e->LOCK_parallel_entry);
|
|
|
|
did_mark_start_commit= true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-31 12:23:14 +01:00
|
|
|
#endif
|