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

Use 64bits for server status flags

Browse Source 
Monitor journal still uses 32bits.
This commit is contained in:
Esa Korhonen
2018-05-23 13:52:50 +03:00
parent 3ec449339f
commit f8940d4a2a
3 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/maxscale/monitor.h
View File

@ -227,8 +227,8 @@ typedef struct monitored_server
MYSQL *con; /**< The MySQL connection */ MYSQL *con; /**< The MySQL connection */
bool log_version_err; bool log_version_err;
int mon_err_count; int mon_err_count;
unsigned int mon_prev_status; uint64_t mon_prev_status; /**< Status before starting the current monitor loop */
unsigned int pending_status; /**< Pending Status flag bitmap */ uint64_t pending_status; /**< Status during current monitor loop */
bool new_event; /**< Whether an action was taken on the last event */ bool new_event; /**< Whether an action was taken on the last event */
struct monitored_server *next; /**< The next server in the list */ struct monitored_server *next; /**< The next server in the list */
} MXS_MONITORED_SERVER; } MXS_MONITORED_SERVER;
@ -317,8 +317,8 @@ extern const char CN_EVENTS[];
bool check_monitor_permissions(MXS_MONITOR* monitor, const char* query); bool check_monitor_permissions(MXS_MONITOR* monitor, const char* query);
void monitor_clear_pending_status(MXS_MONITORED_SERVER *ptr, int bit); void monitor_clear_pending_status(MXS_MONITORED_SERVER *ptr, uint64_t bit);
void monitor_set_pending_status(MXS_MONITORED_SERVER *ptr, int bit); void monitor_set_pending_status(MXS_MONITORED_SERVER *ptr, uint64_t bit);
void servers_status_pending_to_current(MXS_MONITOR *monitor); void servers_status_pending_to_current(MXS_MONITOR *monitor);
void servers_status_current_to_pending(MXS_MONITOR *monitor); void servers_status_current_to_pending(MXS_MONITOR *monitor);

38
server/core/monitor.cc
View File

@ -83,13 +83,11 @@ static void remove_server_journal(MXS_MONITOR *monitor);
static bool journal_is_stale(MXS_MONITOR *monitor, time_t max_age); static bool journal_is_stale(MXS_MONITOR *monitor, time_t max_age);
/** Server type specific bits */ /** Server type specific bits */
static unsigned int server_type_bits = SERVER_MASTER | SERVER_SLAVE | static uint64_t server_type_bits = SERVER_MASTER | SERVER_SLAVE | SERVER_JOINED | SERVER_NDB;
SERVER_JOINED | SERVER_NDB;
/** All server bits */ /** All server bits */
static unsigned int all_server_bits = SERVER_RUNNING | SERVER_MAINT | static uint64_t all_server_bits = SERVER_RUNNING | SERVER_MAINT | SERVER_MASTER | SERVER_SLAVE |
SERVER_MASTER | SERVER_SLAVE | SERVER_JOINED | SERVER_NDB;
SERVER_JOINED | SERVER_NDB;
/** /**
* Create a new monitor, load the associated module for the monitor * Create a new monitor, load the associated module for the monitor
@ -957,25 +955,23 @@ void mon_alter_parameter(MXS_MONITOR* monitor, const char* key, const char* valu
} }
/** /**
* Set a pending status bit in the monitor server * Set pending status bits in the monitor server
* *
* @param server The server to update * @param server The server to update
* @param bit The bit to clear for the server * @param bit The bits to set for the server
*/ */
void void monitor_set_pending_status(MXS_MONITORED_SERVER *ptr, uint64_t bit)
monitor_set_pending_status(MXS_MONITORED_SERVER *ptr, int bit)
{ {
ptr->pending_status |= bit; ptr->pending_status |= bit;
} }
/** /**
* Clear a pending status bit in the monitor server * Clear pending status bits in the monitor server
* *
* @param server The server to update * @param server The server to update
* @param bit The bit to clear for the server * @param bit The bits to clear for the server
*/ */
void void monitor_clear_pending_status(MXS_MONITORED_SERVER *ptr, uint64_t bit)
monitor_clear_pending_status(MXS_MONITORED_SERVER *ptr, int bit)
{ {
ptr->pending_status &= ~bit; ptr->pending_status &= ~bit;
} }
@ -1002,8 +998,8 @@ static mxs_monitor_event_t mon_get_event_type(MXS_MONITORED_SERVER* node)
general_event_type event_type = UNSUPPORTED_EVENT; general_event_type event_type = UNSUPPORTED_EVENT;
unsigned int prev = node->mon_prev_status & all_server_bits; uint64_t prev = node->mon_prev_status & all_server_bits;
unsigned int present = node->server->status & all_server_bits; uint64_t present = node->server->status & all_server_bits;
if (prev == present) if (prev == present)
{ {
@ -1036,8 +1032,8 @@ static mxs_monitor_event_t mon_get_event_type(MXS_MONITORED_SERVER* node)
{ {
/** These are used to detect whether we actually lost something or /** These are used to detect whether we actually lost something or
* just transitioned from one state to another */ * just transitioned from one state to another */
unsigned int prev_bits = prev & (SERVER_MASTER | SERVER_SLAVE); uint64_t prev_bits = prev & (SERVER_MASTER | SERVER_SLAVE);
unsigned int present_bits = present & (SERVER_MASTER | SERVER_SLAVE); uint64_t present_bits = present & (SERVER_MASTER | SERVER_SLAVE);
/* Was running and still is */ /* Was running and still is */
if ((!prev_bits || !present_bits || prev_bits == present_bits) && if ((!prev_bits || !present_bits || prev_bits == present_bits) &&
@ -1208,11 +1204,11 @@ bool mon_status_changed(MXS_MONITORED_SERVER* mon_srv)
bool rval = false; bool rval = false;
/* Previous status is -1 if not yet set */ /* Previous status is -1 if not yet set */
if (mon_srv->mon_prev_status != static_cast<uint32_t>(-1)) if (mon_srv->mon_prev_status != static_cast<uint64_t>(-1))
{ {
unsigned int old_status = mon_srv->mon_prev_status & all_server_bits; uint64_t old_status = mon_srv->mon_prev_status & all_server_bits;
unsigned int new_status = mon_srv->server->status & all_server_bits; uint64_t new_status = mon_srv->server->status & all_server_bits;
/** /**
* The state has changed if the relevant state bits are not the same, * The state has changed if the relevant state bits are not the same,
@ -2167,7 +2163,7 @@ static const char* process_server(MXS_MONITOR *monitor, const char *data, const
ss_dassert(sptr); ss_dassert(sptr);
sptr++; sptr++;
uint32_t state = mxs_get_byte4(sptr); uint64_t state = mxs_get_byte4(sptr); // TODO: Fix type mismatch with monitor journal
db->mon_prev_status = state; db->mon_prev_status = state;
db->server->status_pending = state; db->server->status_pending = state;
server_set_status_nolock(db->server, state); server_set_status_nolock(db->server, state);

2
server/modules/monitor/mariadbmon/cluster_discovery.cc
View File

@ -835,7 +835,7 @@ void MariaDBMonitor::update_server_states(MariaDBServer& db_server, MariaDBServe
if (m_detect_stale_slave) if (m_detect_stale_slave)
{ {
unsigned int bits = SERVER_SLAVE | SERVER_RUNNING; uint64_t bits = SERVER_SLAVE | SERVER_RUNNING;
if ((ptr->mon_prev_status & bits) == bits && if ((ptr->mon_prev_status & bits) == bits &&
root_master && SRV_MASTER_STATUS(root_master->pending_status)) root_master && SRV_MASTER_STATUS(root_master->pending_status))