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] 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.