diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc index 9ba761a2c..6c9863345 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.cc +++ b/server/modules/routing/readwritesplit/readwritesplit.cc @@ -1197,8 +1197,6 @@ static void clientReply(MXS_ROUTER *instance, */ if (backend->session_command_count()) { - check_session_command_reply(writebuf, backend); - /** This discards all responses that have already been sent to the client */ bool rconn = false; process_sescmd_response(rses, backend, &writebuf, &rconn); diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.cc b/server/modules/routing/readwritesplit/rwsplit_mysql.cc index 8816ca714..a2b4f1de7 100644 --- a/server/modules/routing/readwritesplit/rwsplit_mysql.cc +++ b/server/modules/routing/readwritesplit/rwsplit_mysql.cc @@ -283,34 +283,6 @@ void closed_session_reply(GWBUF *querybuf) } } -/* - * Uses MySQL specific mechanisms - */ -/** - * @brief Check the reply from a backend server to a session command - * - * If the reply is an error, a message is logged. - * - * @param buffer Query buffer containing reply data - * @param backend Router session data for a backend server - */ -void check_session_command_reply(GWBUF *buffer, SRWBackend& backend) -{ - if (MYSQL_IS_ERROR_PACKET(((uint8_t *)GWBUF_DATA(buffer)))) - { - size_t replylen = MYSQL_GET_PAYLOAD_LEN(GWBUF_DATA(buffer)); - char replybuf[replylen]; - gwbuf_copy_data(buffer, 0, gwbuf_length(buffer), (uint8_t*)replybuf); - std::string err; - std::string msg; - err.append(replybuf + 8, 5); - msg.append(replybuf + 13, replylen - 4 - 5); - - MXS_ERROR("Failed to execute session command in %s. Error was: %s %s", - backend->uri(), err.c_str(), msg.c_str()); - } -} - /** * @brief Send an error message to the client telling that the server is in read only mode * diff --git a/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc b/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc index 5f21895f0..31d9ea6ac 100644 --- a/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc +++ b/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc @@ -76,9 +76,10 @@ void process_sescmd_response(RWSplitSession* rses, SRWBackend& backend, if (rses->sescmd_responses[id] != cmd) { - MXS_ERROR("Slave server '%s': response differs from master's response. " - "Closing connection due to inconsistent session state.", - backend->name()); + MXS_WARNING("Slave server '%s': response (0x%02hhx) differs " + "from master's response(0x%02hhx). Closing slave " + "connection due to inconsistent session state.", + backend->name(), cmd, rses->sescmd_responses[id]); backend->close(mxs::Backend::CLOSE_FATAL); *pReconnect = true; }