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

Initialize disk_space_checked

Browse Source 
Was reading an uninitialized value.
This commit is contained in:
Esa Korhonen
2018-10-12 17:13:25 +03:00
parent 2d61b78439
commit f518b38364
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/maxscale/monitor.hh
View File

@ -110,6 +110,13 @@ public:
*/ */
virtual json_t* diagnostics_json() const; virtual json_t* diagnostics_json() const;
/**
* Get current time from the monotonic clock.
*
* @return Current time
*/
static int64_t get_time_ms();
protected: protected:
MonitorInstance(MXS_MONITOR* pMonitor); MonitorInstance(MXS_MONITOR* pMonitor);
@ -141,8 +148,6 @@ protected:
*/ */
void update_disk_space_status(MXS_MONITORED_SERVER* pMonitored_server); void update_disk_space_status(MXS_MONITORED_SERVER* pMonitored_server);
static int64_t get_time_ms();
/** /**
* @brief Configure the monitor. * @brief Configure the monitor.
* *

3
server/core/monitor.cc
View File

@ -367,6 +367,9 @@ bool monitor_add_server(MXS_MONITOR* mon, SERVER* server)
db->next = NULL; db->next = NULL;
db->mon_err_count = 0; db->mon_err_count = 0;
db->log_version_err = true; db->log_version_err = true;
// Pretend disk space was just checked.
db->disk_space_checked = maxscale::MonitorInstance::get_time_ms();
/** Server status is uninitialized */ /** Server status is uninitialized */
db->mon_prev_status = -1; db->mon_prev_status = -1;