From fd72332ea471b73091f8cf567997e075ccd7ac4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 1 Aug 2019 16:52:41 +0300 Subject: [PATCH 1/6] Improve master failure error message The message will now always contain the server name. --- .../routing/readwritesplit/rwsplitsession.cc | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/server/modules/routing/readwritesplit/rwsplitsession.cc b/server/modules/routing/readwritesplit/rwsplitsession.cc index a5ddb2585..c3693465a 100644 --- a/server/modules/routing/readwritesplit/rwsplitsession.cc +++ b/server/modules/routing/readwritesplit/rwsplitsession.cc @@ -1012,21 +1012,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. From 2fa336d142661f7b902ed36ae87a0ad98f97febb Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 7 Aug 2019 14:58:19 +0300 Subject: [PATCH 2/6] create symlink for sles15 --- BUILD/mdbci/copy_repos.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh index 71c3483ec..d07cc356e 100755 --- a/BUILD/mdbci/copy_repos.sh +++ b/BUILD/mdbci/copy_repos.sh @@ -28,10 +28,14 @@ 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 + ln -s opensuse/$paltform_version sles/$paltform_version + fi + eval "cat < Date: Wed, 7 Aug 2019 15:41:18 +0300 Subject: [PATCH 3/6] add sles directory creation --- BUILD/mdbci/copy_repos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh index d07cc356e..4cd37de3c 100755 --- a/BUILD/mdbci/copy_repos.sh +++ b/BUILD/mdbci/copy_repos.sh @@ -33,6 +33,7 @@ if [ "$box_type" == "RPM" ] ; then ln -s centos rhel fi if [ "$platform" == "opensuse" ] ; then + mkdir -p sles ln -s opensuse/$paltform_version sles/$paltform_version fi From bb43e6193e068c36edf5abecede19d7db7b6eece Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 7 Aug 2019 16:00:12 +0300 Subject: [PATCH 4/6] fix typo in copy_repos.sh --- BUILD/mdbci/copy_repos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh index 4cd37de3c..9a3bd91f3 100755 --- a/BUILD/mdbci/copy_repos.sh +++ b/BUILD/mdbci/copy_repos.sh @@ -34,7 +34,7 @@ if [ "$box_type" == "RPM" ] ; then fi if [ "$platform" == "opensuse" ] ; then mkdir -p sles - ln -s opensuse/$paltform_version sles/$paltform_version + ln -s opensuse/$platform_version sles/$platform_version fi From 169fb256edb014af0068be4861d0de6565c6a21e Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Wed, 7 Aug 2019 16:02:40 +0300 Subject: [PATCH 5/6] Create symlink for sles15 Currently build is executed for OpenSuse 15 and SLES15 repo is not available. To avoid missing repo symlink sles -> opensuse is created --- BUILD/mdbci/copy_repos.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh index 71c3483ec..9a3bd91f3 100755 --- a/BUILD/mdbci/copy_repos.sh +++ b/BUILD/mdbci/copy_repos.sh @@ -28,10 +28,15 @@ 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 + ln -s opensuse/$platform_version sles/$platform_version + fi + eval "cat < Date: Wed, 7 Aug 2019 19:45:52 +0300 Subject: [PATCH 6/6] fix sles link creation --- BUILD/mdbci/copy_repos.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh index 9a3bd91f3..517ef82dd 100755 --- a/BUILD/mdbci/copy_repos.sh +++ b/BUILD/mdbci/copy_repos.sh @@ -34,7 +34,9 @@ if [ "$box_type" == "RPM" ] ; then fi if [ "$platform" == "opensuse" ] ; then mkdir -p sles - ln -s opensuse/$platform_version sles/$platform_version + cd sles + ln -s ../opensuse/$platform_version $platform_version + cd .. fi