Cleanup monitor.hh

Also removes an unused field from several monitors.

server/core/monitor.cc

@@ -2928,6 +2928,9 @@ void MonitorInstance::post_run()
 
 bool MonitorInstance::call_run_one_tick(Worker::Call::action_t action)
 {
+    /** This is both the minimum sleep between two ticks and also the maximum time between early
+     *  wakeup checks. */
+    const int base_interval_ms = 100;
     if (action == Worker::Call::EXECUTE)
     {
         int64_t now = get_time_ms();
@@ -2946,8 +2949,8 @@ bool MonitorInstance::call_run_one_tick(Worker::Call::action_t action)
         int64_t ms_to_next_call = m_monitor->interval - (now - m_loop_called);
         // ms_to_next_call will be negative, if the run_one_tick() call took
         // longer than one monitor interval.
-        int64_t delay = ((ms_to_next_call <= 0) || (ms_to_next_call >= MXS_MON_BASE_INTERVAL_MS)) ?
-            MXS_MON_BASE_INTERVAL_MS : ms_to_next_call;
+        int64_t delay = ((ms_to_next_call <= 0) || (ms_to_next_call >= base_interval_ms)) ?
+            base_interval_ms : ms_to_next_call;
 
         delayed_call(delay, &MonitorInstance::call_run_one_tick, this);
     }

server/modules/monitor/galeramon/galeramon.cc

@@ -44,7 +44,6 @@ static bool                  using_xtrabackup(MXS_MONITORED_SERVER* database, co
 
 GaleraMonitor::GaleraMonitor(MXS_MONITOR* mon)
     : maxscale::MonitorInstanceSimple(mon)
-    , m_id(MXS_MONITOR_DEFAULT_ID)
     , m_disableMasterFailback(0)
     , m_availableWhenDonor(0)
     , m_disableMasterRoleSetting(0)

server/modules/monitor/galeramon/galeramon.hh

@@ -55,7 +55,6 @@ protected:
     void post_tick();
 
 private:
-    unsigned long m_id;                         /**< Monitor ID */
     int           m_disableMasterFailback;      /**< Monitor flag for Galera Cluster Master failback */
     int           m_availableWhenDonor;         /**< Monitor flag for Galera Cluster Donor availability */
     bool          m_disableMasterRoleSetting;   /**< Monitor flag to disable setting master role */

server/modules/monitor/mmmon/mmmon.cc

@@ -36,7 +36,6 @@ static bool isMySQLEvent(mxs_monitor_event_t event);
 
 MMMonitor::MMMonitor(MXS_MONITOR* monitor)
     : maxscale::MonitorInstanceSimple(monitor)
-    , m_id(MXS_MONITOR_DEFAULT_ID)
     , m_detectStaleMaster(false)
 {
 }

server/modules/monitor/mmmon/mmmon.hh

@@ -37,7 +37,6 @@ protected:
     void post_tick();
 
 private:
-    unsigned long m_id;                 /**< Monitor ID */
     int           m_detectStaleMaster;  /**< Monitor flag for Stale Master detection */
 
     MMMonitor(MXS_MONITOR* monitor);

server/modules/monitor/ndbclustermon/ndbclustermon.cc

@@ -24,7 +24,6 @@
 
 NDBCMonitor::NDBCMonitor(MXS_MONITOR* monitor)
     : maxscale::MonitorInstanceSimple(monitor)
-    , m_id(MXS_MONITOR_DEFAULT_ID)
 {
 }
 

server/modules/monitor/ndbclustermon/ndbclustermon.hh

@@ -33,7 +33,5 @@ protected:
     void update_server_status(MXS_MONITORED_SERVER* monitored_server);
 
 private:
-    unsigned long m_id;     /**< Monitor ID */
-
     NDBCMonitor(MXS_MONITOR* monitor);
 };