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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Marko
2019-07-29 15:52:22 +03:00
parent a9b01ff4cc 3ddcc49288
commit 4503f02adb
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxutils/maxbase/src/log.cc
View File

@ -894,7 +894,7 @@ int mxb_log_message(int priority,
this_unit.in_memory_log(msg.c_str(), msg.length()); this_unit.in_memory_log(msg.c_str(), msg.length());
} }
if (mxb_log_is_priority_enabled(priority)) if (mxb_log_is_priority_enabled(level))
{ {
err = this_unit.sLogger->write(msg.c_str(), msg.length()) ? 0 : -1; err = this_unit.sLogger->write(msg.c_str(), msg.length()) ? 0 : -1;
} }

20
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -243,6 +243,17 @@ bool RWSplitSession::route_single_stmt(GWBUF* querybuf)
{ {
update_trx_statistics(); update_trx_statistics();
auto next_master = get_target_backend(BE_MASTER, NULL, MXS_RLAG_UNDEFINED);
if (should_replace_master(next_master))
{
MXS_INFO("Replacing old master '%s' with new master '%s'",
m_current_master ?
m_current_master->name() : "<no previous master>",
next_master->name());
replace_master(next_master);
}
if (m_qc.is_trx_starting() // A transaction is starting if (m_qc.is_trx_starting() // A transaction is starting
&& !session_trx_is_read_only(m_client->session) // Not explicitly read-only && !session_trx_is_read_only(m_client->session) // Not explicitly read-only
&& should_try_trx_on_slave(route_target)) // Qualifies for speculative routing && should_try_trx_on_slave(route_target)) // Qualifies for speculative routing
@ -1002,15 +1013,6 @@ bool RWSplitSession::handle_master_is_target(RWBackend** dest)
RWBackend* target = get_target_backend(BE_MASTER, NULL, SERVER::RLAG_UNDEFINED); RWBackend* target = get_target_backend(BE_MASTER, NULL, SERVER::RLAG_UNDEFINED);
bool succp = true; bool succp = true;
if (should_replace_master(target))
{
MXS_INFO("Replacing old master '%s' with new master '%s'",
m_current_master ?
m_current_master->name() : "<no previous master>",
target->name());
replace_master(target);
}
if (target && target == m_current_master) if (target && target == m_current_master)
{ {
mxb::atomic::add(&m_router->stats().n_master, 1, mxb::atomic::RELAXED); mxb::atomic::add(&m_router->stats().n_master, 1, mxb::atomic::RELAXED);