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

Remove MonitorManager calls from Monitor functions

Browse Source 
Also adds admin thread checks to MonitorManager functions and combines
anonymous namespaces.
This commit is contained in:
Esa Korhonen
2019-04-26 12:18:26 +03:00
parent c4b27cdefc
commit 82b4338eca
15 changed files with 138 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
server/core/monitor.cc
View File

@ -87,17 +87,6 @@ const char CN_SCRIPT_TIMEOUT[] = "script_timeout";
namespace
{
/**
* Is the current thread either the main thread or the runtime admin thread?
*
* @return True if running in an admin thread
*/
bool is_admin_thread()
{
mxb::Worker* current = mxb::Worker::get_current();
return (current == nullptr || current == mxs_rworker_get(MXS_RWORKER_MAIN));
}
class ThisUnit
{
public:
@ -112,7 +101,7 @@ public:
*/
bool claim_server(const string& server, const string& new_owner, string* existing_owner)
{
mxb_assert(is_admin_thread());
mxb_assert(Monitor::is_admin_thread());
bool claim_success = false;
auto iter = m_server_owners.find(server);
if (iter != m_server_owners.end())
@ -135,7 +124,7 @@ public:
*/
void release_server(const string& server)
{
mxb_assert(is_admin_thread());
mxb_assert(Monitor::is_admin_thread());
auto iter = m_server_owners.find(server);
mxb_assert(iter != m_server_owners.end());
m_server_owners.erase(iter);
@ -144,7 +133,7 @@ public:
string claimed_by(const string& server)
{
mxb_assert(is_admin_thread());
mxb_assert(Monitor::is_admin_thread());
string rval;
auto iter = m_server_owners.find(server);
if (iter != m_server_owners.end())
@ -435,6 +424,36 @@ json_t* monitor_parameters_to_json(const Monitor* monitor)
return rval;
}
bool check_disk_space_exhausted(MonitorServer* pMs,
const std::string& path,
const maxscale::disk::SizesAndName& san,
int32_t max_percentage)
{
bool disk_space_exhausted = false;
int32_t used_percentage = ((san.total() - san.available()) / (double)san.total()) * 100;
if (used_percentage >= max_percentage)
{
MXS_ERROR("Disk space on %s at %s is exhausted; %d%% of the the disk "
"mounted on the path %s has been used, and the limit it %d%%.",
pMs->server->name(),
pMs->server->address,
used_percentage,
path.c_str(),
max_percentage);
disk_space_exhausted = true;
}
return disk_space_exhausted;
}
const char ERR_CANNOT_MODIFY[] =
"The server is monitored, so only the maintenance status can be "
"set/cleared manually. Status was not modified.";
const char WRN_REQUEST_OVERWRITTEN[] =
"Previous maintenance request was not yet read by the monitor and was overwritten.";
}
json_t* monitor_json_data(const Monitor* monitor, const char* host)
@ -1277,6 +1296,12 @@ string Monitor::get_server_monitor(const SERVER* server)
return this_unit.claimed_by(server->name());
}
bool Monitor::is_admin_thread()
{
mxb::Worker* current = mxb::Worker::get_current();
return (current == nullptr || current == mxs_rworker_get(MXS_RWORKER_MAIN));
}
/**
* Log an error about the failure to connect to a backend server and why it happened.
*
@ -1719,16 +1744,6 @@ bool Monitor::set_disk_space_threshold(const string& dst_setting)
return rv;
}
namespace
{
const char ERR_CANNOT_MODIFY[] =
"The server is monitored, so only the maintenance status can be "
"set/cleared manually. Status was not modified.";
const char WRN_REQUEST_OVERWRITTEN[] =
"Previous maintenance request was not yet read by the monitor and was overwritten.";
}
bool Monitor::set_server_status(SERVER* srv, int bit, string* errmsg_out)
{
MonitorServer* msrv = get_monitored_server(srv);
@ -1860,6 +1875,15 @@ void Monitor::populate_services()
}
}
void Monitor::deactivate()
{
if (state() == MONITOR_STATE_RUNNING)
{
stop();
}
remove_all_servers();
}
bool Monitor::check_disk_space_this_tick()
{
bool should_update_disk_space = false;
@ -1989,34 +2013,6 @@ bool MonitorServer::can_update_disk_space_status() const
return ok_to_check_disk_space && (!monitor_limits.empty() || server->have_disk_space_limits());
}
namespace
{
bool check_disk_space_exhausted(MonitorServer* pMs,
const std::string& path,
const maxscale::disk::SizesAndName& san,
int32_t max_percentage)
{
bool disk_space_exhausted = false;
int32_t used_percentage = ((san.total() - san.available()) / (double)san.total()) * 100;
if (used_percentage >= max_percentage)
{
MXS_ERROR("Disk space on %s at %s is exhausted; %d%% of the the disk "
"mounted on the path %s has been used, and the limit it %d%%.",
pMs->server->name(),
pMs->server->address,
used_percentage,
path.c_str(),
max_percentage);
disk_space_exhausted = true;
}
return disk_space_exhausted;
}
}
void MonitorServer::update_disk_space_status()
{
auto pMs = this; // TODO: Clean
@ -2327,7 +2323,6 @@ bool MonitorWorker::immediate_tick_required() const
{
return false;
}
}
MonitorServer::MonitorServer(SERVER* server, const SERVER::DiskSpaceLimits& monitor_limits)
: server(server)
@ -2342,3 +2337,5 @@ MonitorServer::~MonitorServer()
mysql_close(con);
}
}
}