hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move server_set_status and server_clear_status to monitor

Browse Source 
The operation goes through monitor code so should be in the according file.
This commit is contained in:
Esa Korhonen
2019-04-26 15:08:31 +03:00
parent b0d8535ead
commit a3bb61486d
8 changed files with 71 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -24,6 +24,8 @@
#include <maxscale/router.hh>
#include <maxscale/server.hh>
#include <maxscale/utils.h>
// For setting server status through monitor
#include "../../../../core/internal/monitormanager.hh"
/*
* MySQL Protocol module for handling the protocol between the gateway
@ -340,10 +342,16 @@ static void handle_error_response(DCB* dcb, GWBUF* buffer)
errcode,
bufstr);
/** If the error is ER_HOST_IS_BLOCKED put the server into maintenace mode.
/** If the error is ER_HOST_IS_BLOCKED put the server into maintenance mode.
* This will prevent repeated authentication failures. */
if (errcode == ER_HOST_IS_BLOCKED)
{
auto main_worker = mxs::RoutingWorker::get(mxs::RoutingWorker::MAIN);
auto target_server = dcb->server;
main_worker->execute([target_server]() {
MonitorManager::set_server_status(target_server, SERVER_MAINT);
}, mxb::Worker::EXECUTE_AUTO);
MXS_ERROR("Server %s has been put into maintenance mode due to the server blocking connections "
"from MaxScale. Run 'mysqladmin -h %s -P %d flush-hosts' on this server before taking "
"this server out of maintenance mode. To avoid this problem in the future, set "
@ -351,8 +359,6 @@ static void handle_error_response(DCB* dcb, GWBUF* buffer)
dcb->server->name(),
dcb->server->address,
dcb->server->port);
mxs::server_set_status(dcb->server, SERVER_MAINT);
}
else if (errcode == ER_ACCESS_DENIED_ERROR
|| errcode == ER_DBACCESS_DENIED_ERROR

4
server/modules/routing/cli/debugcmd.cc
View File

@ -2525,7 +2525,7 @@ static void set_server(DCB* dcb, Server* server, char* bit)
if ((bitvalue = SERVER::status_from_string(bit)) != 0)
{
std::string errmsg;
if (!mxs::server_set_status(server, bitvalue, &errmsg))
if (!MonitorManager::set_server_status(server, bitvalue, &errmsg))
{
dcb_printf(dcb, "%s\n", errmsg.c_str());
}
@ -2551,7 +2551,7 @@ static void clear_server(DCB* dcb, Server* server, char* bit)
if ((bitvalue = SERVER::status_from_string(bit)) != 0)
{
std::string errmsg;
if (!mxs::server_clear_status(server, bitvalue, &errmsg))
if (!MonitorManager::clear_server_status(server, bitvalue, &errmsg))
{
dcb_printf(dcb, "%s", errmsg.c_str());
}

4
server/modules/routing/maxinfo/maxinfo_exec.cc
View File

@ -325,7 +325,7 @@ void exec_set_server(DCB* dcb, MAXINFO_TREE* tree)
if (status != 0)
{
std::string errmsgs;
if (mxs::server_set_status(server, status, &errmsgs))
if (MonitorManager::set_server_status(server, status, &errmsgs))
{
maxinfo_send_ok(dcb);
}
@ -412,7 +412,7 @@ void exec_clear_server(DCB* dcb, MAXINFO_TREE* tree)
if (status != 0)
{
std::string errmsgs;
if (mxs::server_clear_status(server, status, &errmsgs))
if (MonitorManager::clear_server_status(server, status, &errmsgs))
{
maxinfo_send_ok(dcb);
}