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:
Markus Mäkelä
2020-07-24 08:01:53 +03:00
parent d99d2f21a6 aaec73a8c8
commit 5c76d3d906
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
BUILD/install_test_build_deps.sh
View File

@ -16,14 +16,17 @@ then
echo "deb http://mirror.netinch.com/pub/mariadb/repo/10.3/ubuntu/ ${UBUNTU_CODENAME} main" > mariadb.list echo "deb http://mirror.netinch.com/pub/mariadb/repo/10.3/ubuntu/ ${UBUNTU_CODENAME} main" > mariadb.list
sudo cp mariadb.list /etc/apt/sources.list.d/ sudo cp mariadb.list /etc/apt/sources.list.d/
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0xF1656F24C74CD1D8 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0xF1656F24C74CD1D8
export DEBIAN_FRONTEND=noninteractive
sudo apt-get update sudo apt-get update
sudo apt-get install -y --force-yes \ sudo -E apt-get -q -o Dpkg::Options::=--force-confold \
git wget build-essential \ -o Dpkg::Options::=--force-confdef \
libssl-dev mariadb-client php perl \ -y --force-yes \
coreutils libjansson-dev zlib1g-dev \ install \
mariadb-test python python-pip cmake \ git wget build-essential \
libpam0g-dev libsqlite3-dev \ libssl-dev mariadb-client php perl \
libcurl4-gnutls-dev coreutils libjansson-dev zlib1g-dev \
mariadb-test python python-pip cmake libpam0g-dev \
libsqlite3-dev libcurl4-gnutls-dev
sudo apt-get install -y --force-yes openjdk-8-jdk sudo apt-get install -y --force-yes openjdk-8-jdk
sudo apt-get install -y --force-yes php-mysql sudo apt-get install -y --force-yes php-mysql
if [ $? != 0 ] if [ $? != 0 ]

1
server/modules/filter/throttlefilter/throttlesession.cc
View File

@ -96,6 +96,7 @@ int ThrottleSession::real_routeQuery(GWBUF* buffer, bool is_delayed)
MXS_NOTICE("Query throttling Session %ld user %s, throttling limit reached. Disconnect.", MXS_NOTICE("Query throttling Session %ld user %s, throttling limit reached. Disconnect.",
m_pSession->ses_id, m_pSession->ses_id,
m_pSession->client_dcb->user); m_pSession->client_dcb->user);
gwbuf_free(buffer);
return false; // disconnect return false; // disconnect
} }
} }

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

@ -553,9 +553,19 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
} }
else else
{ {
MXS_ERROR("Failed to execute session command in %s (%s)", backend->close();
backend->name(),
backend->uri()); if (m_config.master_failure_mode == RW_FAIL_INSTANTLY && backend == m_current_master)
{
MXS_ERROR("Failed to execute session command in Master: %s (%s)",
backend->name(), backend->uri());
return false;
}
else
{
MXS_ERROR("Failed to execute session command in %s (%s)",
backend->name(), backend->uri());
}
} }
} }
} }