From f518b383649452be202dc0a6d6334dc35eae14ea Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Fri, 12 Oct 2018 17:13:25 +0300 Subject: [PATCH] Initialize disk_space_checked Was reading an uninitialized value. --- include/maxscale/monitor.hh | 9 +++++++-- server/core/monitor.cc | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/maxscale/monitor.hh b/include/maxscale/monitor.hh index 8e4a0e62b..65525aef1 100644 --- a/include/maxscale/monitor.hh +++ b/include/maxscale/monitor.hh @@ -110,6 +110,13 @@ public: */ virtual json_t* diagnostics_json() const; + /** + * Get current time from the monotonic clock. + * + * @return Current time + */ + static int64_t get_time_ms(); + protected: MonitorInstance(MXS_MONITOR* pMonitor); @@ -141,8 +148,6 @@ protected: */ void update_disk_space_status(MXS_MONITORED_SERVER* pMonitored_server); - static int64_t get_time_ms(); - /** * @brief Configure the monitor. * diff --git a/server/core/monitor.cc b/server/core/monitor.cc index e46a86cfa..34b85879a 100644 --- a/server/core/monitor.cc +++ b/server/core/monitor.cc @@ -367,6 +367,9 @@ bool monitor_add_server(MXS_MONITOR* mon, SERVER* server) db->next = NULL; db->mon_err_count = 0; db->log_version_err = true; + // Pretend disk space was just checked. + db->disk_space_checked = maxscale::MonitorInstance::get_time_ms(); + /** Server status is uninitialized */ db->mon_prev_status = -1;