hcq/MaxScale
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:
Johan Wikman 2019-08-08 08:07:59 +03:00
commit 27f11df700
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BUILD/mdbci/copy_repos.sh
View File

@ -28,10 +28,17 @@ if [ "$box_type" == "RPM" ] ; then
cd $path_prefix/$platform
ln -s $platform_version "$platform_version"server
ln -s $platform_version "$platform_version"Server
cd ..
if [ "$platform" == "centos" ] ; then
cd ..
ln -s centos rhel
fi
if [ "$platform" == "opensuse" ] ; then
mkdir -p sles
cd sles
ln -s ../opensuse/$platform_version $platform_version
cd ..
fi
eval "cat <<EOF
$(<${script_dir}/templates/repository-config/rpm.json.template)

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

@ -1090,21 +1090,11 @@ void RWSplitSession::handleError(GWBUF* errmsgbuf,
if (!can_continue)
{
if (!backend->is_master() && !backend->server()->master_err_is_logged)
{
MXS_ERROR("Server %s (%s) lost the master status while waiting"
" for a result. Client sessions will be closed.",
backend->name(),
backend->uri());
backend->server()->master_err_is_logged = true;
}
else
{
int64_t idle = mxs_clock() - backend->dcb()->last_read;
MXS_ERROR("Lost connection to the master server, closing session.%s "
"Connection has been idle for %.1f seconds. Error caused by: %s",
errmsg.c_str(), (float)idle / 10.f, extract_error(errmsgbuf).c_str());
}
int64_t idle = mxs_clock() - backend->dcb()->last_read;
MXS_ERROR("Lost connection to the master server '%s', closing session.%s "
"Connection has been idle for %.1f seconds. Error caused by: %s",
backend->name(), errmsg.c_str(), (float)idle / 10.f,
extract_error(errmsgbuf).c_str());
}
// Decrement the expected response count only if we know we can continue the sesssion.