mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
647c619393
when generating new name. If find_uniq_filename returns an error, then this error is not being propagated upwards, and execution does not report error to the user (although a entry in the error log is generated). Additionally, some more errors were ignored in new_file_impl: - when writing the rotate event - when reopening the index and binary log file This patch addresses this by propagating the error up in the execution stack. Furthermore, when rotation of the binary log fails, an incident event is written, because there may be a chance that some changes for a given statement, were not properly logged. For example, in SBR, LOAD DATA INFILE statement requires more than one event to be logged, should rotation fail while logging part of the LOAD DATA events, then the logged data would become inconsistent with the data in the storage engine. mysql-test/include/restart_mysqld.inc: Refactored restart_mysqld so that it is not hardcoded for mysqld.1, but rather for the current server. mysql-test/suite/binlog/t/binlog_index.test: The error on open of index and binary log on new_file_impl is now caught. Thence the user will get an error message. We need to accomodate this change in the test case for the failing FLUSH LOGS. mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt: Sets max_binlog_size to 4096. mysql-test/suite/rpl/t/rpl_binlog_errors.test: Added some test cases for asserting that the error is found and reported. sql/handler.cc: Catching error now returned by unlog (in ha_commit_trans) and returning it. sql/log.cc: Propagating errors from new_file_impl upwards. The errors that new_file_impl catches now are: - error on generate_new_name - error on writing the rotate event - error when opening the index or the binary log file. sql/log.h: Changing declaration of: - rotate_and_purge - new_file - new_file_without_locking - new_file_impl - unlog They now return int instead of void. sql/mysql_priv.h: Change signature of reload_acl_and_cache so that write_to_binlog is an int instead of bool. sql/mysqld.cc: Redeclaring not_used var as int instead of bool. sql/rpl_injector.cc: Changes to catch the return from rotate_and_purge. sql/slave.cc: Changes to catch the return values for new_file and rotate_relay_log. sql/slave.h: Changes to rotate_relay_log declaration (now returns int instead of void). sql/sql_load.cc: In SBR, some logging of LOAD DATA events goes through IO_CACHE_CALLBACK invocation at mf_iocache.c:_my_b_get. The IO_CACHE implementation is ignoring the return value for from these callbacks (pre_read and post_read), so we need to find out at the end of the execution if the error is set or not in THD. sql/sql_parse.cc: Catching the rotate_relay_log and rotate_and_purge return values. Semantic change in reload_acl_and_cache so that we report errors in binlog interactions through the write_to_binlog output parameter. If there was any failure while rotating the binary log, we should then report the error to the client when handling SQLCOMM_FLUSH.
241 lines
6.8 KiB
C++
241 lines
6.8 KiB
C++
/* Copyright (C) 2006 MySQL AB
|
|
|
|
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
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
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
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#include "mysql_priv.h"
|
|
#include "rpl_injector.h"
|
|
|
|
/*
|
|
injector::transaction - member definitions
|
|
*/
|
|
|
|
/* inline since it's called below */
|
|
inline
|
|
injector::transaction::transaction(MYSQL_BIN_LOG *log, THD *thd)
|
|
: m_state(START_STATE), m_thd(thd)
|
|
{
|
|
/*
|
|
Default initialization of m_start_pos (which initializes it to garbage).
|
|
We need to fill it in using the code below.
|
|
*/
|
|
LOG_INFO log_info;
|
|
log->get_current_log(&log_info);
|
|
/* !!! binlog_pos does not follow RAII !!! */
|
|
m_start_pos.m_file_name= my_strdup(log_info.log_file_name, MYF(0));
|
|
m_start_pos.m_file_pos= log_info.pos;
|
|
|
|
begin_trans(m_thd);
|
|
|
|
thd->set_current_stmt_binlog_row_based();
|
|
}
|
|
|
|
injector::transaction::~transaction()
|
|
{
|
|
if (!good())
|
|
return;
|
|
|
|
/* Needed since my_free expects a 'char*' (instead of 'void*'). */
|
|
char* const the_memory= const_cast<char*>(m_start_pos.m_file_name);
|
|
|
|
/*
|
|
We set the first character to null just to give all the copies of the
|
|
start position a (minimal) chance of seening that the memory is lost.
|
|
All assuming the my_free does not step over the memory, of course.
|
|
*/
|
|
*the_memory= '\0';
|
|
|
|
my_free(the_memory, MYF(0));
|
|
}
|
|
|
|
/**
|
|
@retval 0 transaction committed
|
|
@retval 1 transaction rolled back
|
|
*/
|
|
int injector::transaction::commit()
|
|
{
|
|
DBUG_ENTER("injector::transaction::commit()");
|
|
int error= m_thd->binlog_flush_pending_rows_event(true);
|
|
/*
|
|
Cluster replication does not preserve statement or
|
|
transaction boundaries of the master. Instead, a new
|
|
transaction on replication slave is started when a new GCI
|
|
(global checkpoint identifier) is issued, and is committed
|
|
when the last event of the check point has been received and
|
|
processed. This ensures consistency of each cluster in
|
|
cluster replication, and there is no requirement for stronger
|
|
consistency: MySQL replication is asynchronous with other
|
|
engines as well.
|
|
|
|
A practical consequence of that is that row level replication
|
|
stream passed through the injector thread never contains
|
|
COMMIT events.
|
|
Here we should preserve the server invariant that there is no
|
|
outstanding statement transaction when the normal transaction
|
|
is committed by committing the statement transaction
|
|
explicitly.
|
|
*/
|
|
error |= ha_autocommit_or_rollback(m_thd, error);
|
|
end_trans(m_thd, error ? ROLLBACK : COMMIT);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
int injector::transaction::use_table(server_id_type sid, table tbl)
|
|
{
|
|
DBUG_ENTER("injector::transaction::use_table");
|
|
|
|
int error;
|
|
|
|
if ((error= check_state(TABLE_STATE)))
|
|
DBUG_RETURN(error);
|
|
|
|
server_id_type save_id= m_thd->server_id;
|
|
m_thd->set_server_id(sid);
|
|
error= m_thd->binlog_write_table_map(tbl.get_table(),
|
|
tbl.is_transactional());
|
|
m_thd->set_server_id(save_id);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
int injector::transaction::write_row (server_id_type sid, table tbl,
|
|
MY_BITMAP const* cols, size_t colcnt,
|
|
record_type record)
|
|
{
|
|
DBUG_ENTER("injector::transaction::write_row(...)");
|
|
|
|
int error= check_state(ROW_STATE);
|
|
if (error)
|
|
DBUG_RETURN(error);
|
|
|
|
server_id_type save_id= m_thd->server_id;
|
|
m_thd->set_server_id(sid);
|
|
error= m_thd->binlog_write_row(tbl.get_table(), tbl.is_transactional(),
|
|
cols, colcnt, record);
|
|
m_thd->set_server_id(save_id);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
int injector::transaction::delete_row(server_id_type sid, table tbl,
|
|
MY_BITMAP const* cols, size_t colcnt,
|
|
record_type record)
|
|
{
|
|
DBUG_ENTER("injector::transaction::delete_row(...)");
|
|
|
|
int error= check_state(ROW_STATE);
|
|
if (error)
|
|
DBUG_RETURN(error);
|
|
|
|
server_id_type save_id= m_thd->server_id;
|
|
m_thd->set_server_id(sid);
|
|
error= m_thd->binlog_delete_row(tbl.get_table(), tbl.is_transactional(),
|
|
cols, colcnt, record);
|
|
m_thd->set_server_id(save_id);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
int injector::transaction::update_row(server_id_type sid, table tbl,
|
|
MY_BITMAP const* cols, size_t colcnt,
|
|
record_type before, record_type after)
|
|
{
|
|
DBUG_ENTER("injector::transaction::update_row(...)");
|
|
|
|
int error= check_state(ROW_STATE);
|
|
if (error)
|
|
DBUG_RETURN(error);
|
|
|
|
server_id_type save_id= m_thd->server_id;
|
|
m_thd->set_server_id(sid);
|
|
error= m_thd->binlog_update_row(tbl.get_table(), tbl.is_transactional(),
|
|
cols, colcnt, before, after);
|
|
m_thd->set_server_id(save_id);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
injector::transaction::binlog_pos injector::transaction::start_pos() const
|
|
{
|
|
return m_start_pos;
|
|
}
|
|
|
|
|
|
/*
|
|
injector - member definitions
|
|
*/
|
|
|
|
/* This constructor is called below */
|
|
inline injector::injector()
|
|
{
|
|
}
|
|
|
|
static injector *s_injector= 0;
|
|
injector *injector::instance()
|
|
{
|
|
if (s_injector == 0)
|
|
s_injector= new injector;
|
|
/* "There can be only one [instance]" */
|
|
return s_injector;
|
|
}
|
|
|
|
void injector::free_instance()
|
|
{
|
|
injector *inj = s_injector;
|
|
|
|
if (inj != 0)
|
|
{
|
|
s_injector= 0;
|
|
delete inj;
|
|
}
|
|
}
|
|
|
|
|
|
injector::transaction injector::new_trans(THD *thd)
|
|
{
|
|
DBUG_ENTER("injector::new_trans(THD*)");
|
|
/*
|
|
Currently, there is no alternative to using 'mysql_bin_log' since that
|
|
is hardcoded into the way the handler is using the binary log.
|
|
*/
|
|
DBUG_RETURN(transaction(&mysql_bin_log, thd));
|
|
}
|
|
|
|
void injector::new_trans(THD *thd, injector::transaction *ptr)
|
|
{
|
|
DBUG_ENTER("injector::new_trans(THD *, transaction *)");
|
|
/*
|
|
Currently, there is no alternative to using 'mysql_bin_log' since that
|
|
is hardcoded into the way the handler is using the binary log.
|
|
*/
|
|
transaction trans(&mysql_bin_log, thd);
|
|
ptr->swap(trans);
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
int injector::record_incident(THD *thd, Incident incident)
|
|
{
|
|
Incident_log_event ev(thd, incident);
|
|
if (int error= mysql_bin_log.write(&ev))
|
|
return error;
|
|
return mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
|
|
}
|
|
|
|
int injector::record_incident(THD *thd, Incident incident, LEX_STRING const message)
|
|
{
|
|
Incident_log_event ev(thd, incident, message);
|
|
if (int error= mysql_bin_log.write(&ev))
|
|
return error;
|
|
return mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
|
|
}
|