hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix transaction replay debug assertion

Browse Source 
A transaction that just completed will go through the start_trx_replay
function as from the client protocol's point of view the transaction is
still open. The debug assertion did not take this into account and would
fail if a successful commit was the last thing done on master that failed.

Also fixed the formatting.
This commit is contained in:
Markus Mäkelä
2018-11-26 12:27:29 +02:00
parent 81937c635b
commit 851793cb86
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -810,16 +810,17 @@ bool RWSplitSession::start_trx_replay()
*/ */
mxb_assert_message(qc_get_trx_type_mask(m_interrupted_query.get()) & QUERY_TYPE_BEGIN_TRX, mxb_assert_message(qc_get_trx_type_mask(m_interrupted_query.get()) & QUERY_TYPE_BEGIN_TRX,
"The current query should start a transaction"); "The current query should start a transaction");
MXS_INFO("Retrying interrupted query: %s", MXS_INFO("Retrying interrupted query: %s",
mxs::extract_sql(m_interrupted_query.get()).c_str()); mxs::extract_sql(m_interrupted_query.get()).c_str());
retry_query(m_interrupted_query.release(), 0); retry_query(m_interrupted_query.release(), 0);
} }
} }
else else
{ {
mxb_assert_message(!session_is_autocommit(m_client->session), mxb_assert_message(!session_is_autocommit(m_client->session)
"Session should have autocommit disabled if the transaction " || session_trx_is_ending(m_client->session),
"had no statements and no query was interrupted"); "Session should have autocommit disabled or transaction just ended if the "
"transaction had no statements and no query was interrupted");
} }
rval = true; rval = true;
@ -914,7 +915,7 @@ void RWSplitSession::handleError(GWBUF* errmsgbuf,
if (!backend->is_master() && !backend->server()->master_err_is_logged) if (!backend->is_master() && !backend->server()->master_err_is_logged)
{ {
MXS_ERROR("Server %s (%s) lost the master status while waiting" MXS_ERROR("Server %s (%s) lost the master status while waiting"
" for a result. Client sessions will be closed.", " for a result. Client sessions will be closed.",
backend->name(), backend->name(),
backend->uri()); backend->uri());
backend->server()->master_err_is_logged = true; backend->server()->master_err_is_logged = true;