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

Merge branch '2.3' of github.com:mariadb-corporation/MaxScale into 2.3

Browse Source
This commit is contained in:
Timofey Turenko
2019-04-23 12:24:58 +03:00
parent 7fc3527e1d ba79028a46
commit a60e3c275c
5 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Release-Notes/MaxScale-2.3.6-Release-Notes.md
View File

@ -1,4 +1,4 @@
# MariaDB MaxScale 2.3.6 Release Notes # MariaDB MaxScale 2.3.6 Release Notes -- 2019-04-23
Release 2.3.6 is a GA release. Release 2.3.6 is a GA release.

2
VERSION23.cmake
View File

@ -5,7 +5,7 @@
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version") set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "6" CACHE STRING "Patch version") set(MAXSCALE_VERSION_PATCH "7" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt # This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

2
maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_multimaster_serverid
View File

@ -10,6 +10,7 @@ user=maxskysql
password= skysql password= skysql
detect_stale_master=0 detect_stale_master=0
monitor_interval=1000 monitor_interval=1000
assume_unique_hostnames=false
[RW Split Router] [RW Split Router]
type=service type=service
@ -18,6 +19,7 @@ servers=server1, server2, server3, server4
user=maxskysql user=maxskysql
password=skysql password=skysql
slave_selection_criteria=LEAST_ROUTER_CONNECTIONS slave_selection_criteria=LEAST_ROUTER_CONNECTIONS
max_slave_replication_lag=1
[Read Connection Router Slave] [Read Connection Router Slave]
type=service type=service

4
server/core/dcb.cc
View File

@ -565,6 +565,7 @@ int dcb_read(DCB* dcb,
GWBUF** head, GWBUF** head,
int maxbytes) int maxbytes)
{ {
mxb_assert(dcb->poll.owner == RoutingWorker::get_current());
int nsingleread = 0; int nsingleread = 0;
int nreadtotal = 0; int nreadtotal = 0;
@ -904,6 +905,7 @@ static int dcb_log_errors_SSL(DCB* dcb, int ret)
*/ */
int dcb_write(DCB* dcb, GWBUF* queue) int dcb_write(DCB* dcb, GWBUF* queue)
{ {
mxb_assert(dcb->poll.owner == RoutingWorker::get_current());
dcb->writeqlen += gwbuf_length(queue); dcb->writeqlen += gwbuf_length(queue);
// The following guarantees that queue is not NULL // The following guarantees that queue is not NULL
if (!dcb_write_parameter_check(dcb, queue)) if (!dcb_write_parameter_check(dcb, queue))
@ -3301,6 +3303,7 @@ public:
RoutingWorker& rworker = static_cast<RoutingWorker&>(worker); RoutingWorker& rworker = static_cast<RoutingWorker&>(worker);
if (dcb_is_still_valid(m_dcb, rworker.id()) && m_dcb->m_uid == m_uid) if (dcb_is_still_valid(m_dcb, rworker.id()) && m_dcb->m_uid == m_uid)
{ {
mxb_assert(m_dcb->poll.owner == RoutingWorker::get_current());
m_dcb->fakeq = m_buffer; m_dcb->fakeq = m_buffer;
dcb_handler(m_dcb, m_ev); dcb_handler(m_dcb, m_ev);
} }
@ -3321,6 +3324,7 @@ static void poll_add_event_to_dcb(DCB* dcb, GWBUF* buf, uint32_t ev)
{ {
if (dcb == this_thread.current_dcb) if (dcb == this_thread.current_dcb)
{ {
mxb_assert(dcb->poll.owner == RoutingWorker::get_current());
// If the fake event is added to the current DCB, we arrange for // If the fake event is added to the current DCB, we arrange for
// it to be handled immediately in dcb_handler() when the handling // it to be handled immediately in dcb_handler() when the handling
// of the current events are done... // of the current events are done...

2
server/modules/protocol/MySQL/mariadb_client.cc
View File

@ -32,6 +32,8 @@ LocalClient::LocalClient(MYSQL_session* session, MySQLProtocol* proto, int fd)
, m_self_destruct(false) , m_self_destruct(false)
{ {
MXB_POLL_DATA::handler = LocalClient::poll_handler; MXB_POLL_DATA::handler = LocalClient::poll_handler;
m_protocol.owner_dcb = nullptr;
m_protocol.stored_query = nullptr;
} }
LocalClient::~LocalClient() LocalClient::~LocalClient()