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

Mmmon formatting changes

Browse Source 
Fixed indentation, bracket alignment and other minor things.
This commit is contained in:
Markus Makela
2015-11-16 14:03:42 +02:00
parent 797d9dc03d
commit 6846b0b6b6
1 changed files with 515 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
server/modules/monitor/mmmon.c
View File

@ -37,7 +37,8 @@ static void monitorMain(void *);
static char *version_str = "V1.1.1";
MODULE_INFO info = {
MODULE_INFO info =
{
MODULE_API_MONITOR,
MODULE_BETA_RELEASE,
MONITOR_VERSION,
@ -51,7 +52,8 @@ static void detectStaleMaster(void *, int);
static MONITOR_SERVERS *get_current_master(MONITOR *);
bool isMySQLEvent(monitor_event_t event);
static MONITOR_OBJECT MyObject = {
static MONITOR_OBJECT MyObject =
{
startMonitor,
stopMonitor,
diagnostics
@ -118,7 +120,9 @@ startMonitor(void *arg,void* opt)
else
{
if ((handle = (MM_MONITOR *) malloc(sizeof(MM_MONITOR))) == NULL)
{
return NULL;
}
handle->shutdown = 0;
handle->id = MONITOR_DEFAULT_ID;
handle->master = NULL;
@ -148,11 +152,16 @@ startMonitor(void *arg,void* opt)
}
else if (!strcmp(params->name, "events"))
{
if(mon_parse_event_string((bool*)&handle->events,sizeof(handle->events),params->value) != 0)
if (mon_parse_event_string((bool*) & handle->events,
sizeof(handle->events), params->value) != 0)
{
script_error = true;
}
else
{
have_events = true;
}
}
params = params->next;
}
if (script_error)
@ -249,7 +258,9 @@ char *server_string;
/* Don't probe servers in maintenance mode */
if (SERVER_IN_MAINT(database->server))
{
return;
}
/** Store previous status */
database->mon_prev_status = database->server->status;
@ -333,7 +344,8 @@ char *server_string;
*/
/* Check first for MariaDB 10.x.x and get status for multimaster replication */
if (server_version >= 100000) {
if (server_version >= 100000)
{
if (mysql_query(database->con, "SHOW ALL SLAVES STATUS") == 0
&& (result = mysql_store_result(database->con)) != NULL)
@ -354,7 +366,8 @@ char *server_string;
{
/* get Slave_IO_Running and Slave_SQL_Running values*/
if (strncmp(row[12], "Yes", 3) == 0
&& strncmp(row[13], "Yes", 3) == 0) {
&& strncmp(row[13], "Yes", 3) == 0)
{
isslave += 1;
}
@ -363,12 +376,15 @@ char *server_string;
* root master server.
* Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
*/
if (strncmp(row[12], "Yes", 3) == 0) {
if (strncmp(row[12], "Yes", 3) == 0)
{
/* get Master_Server_Id values */
master_id = atol(row[41]);
if (master_id == 0)
{
master_id = -1;
}
}
i++;
}
@ -379,11 +395,17 @@ char *server_string;
/* If all configured slaves are running set this node as slave */
if (isslave > 0 && isslave == i)
{
isslave = 1;
}
else
{
isslave = 0;
}
} else {
}
}
else
{
if (mysql_query(database->con, "SHOW SLAVE STATUS") == 0
&& (result = mysql_store_result(database->con)) != NULL)
{
@ -417,7 +439,8 @@ char *server_string;
{
/* get Slave_IO_Running and Slave_SQL_Running values*/
if (strncmp(row[10], "Yes", 3) == 0
&& strncmp(row[11], "Yes", 3) == 0) {
&& strncmp(row[11], "Yes", 3) == 0)
{
isslave = 1;
}
@ -426,13 +449,16 @@ char *server_string;
* root master server.
* Please note, there could be no slaves at all if Slave_SQL_Running == 'No'
*/
if (strncmp(row[10], "Yes", 3) == 0) {
if (strncmp(row[10], "Yes", 3) == 0)
{
/* get Master_Server_Id values */
master_id = atol(row[39]);
if (master_id == 0)
{
master_id = -1;
}
}
}
/* store master_id of current node */
memcpy(&database->server->master_id, &master_id, sizeof(long));
@ -454,9 +480,12 @@ char *server_string;
while ((row = mysql_fetch_row(result)))
{
if (strncasecmp(row[1], "OFF", 3) == 0) {
if (strncasecmp(row[1], "OFF", 3) == 0)
{
ismaster = 1;
} else {
}
else
{
isslave = 1;
}
}
@ -475,7 +504,9 @@ char *server_string;
/* Set replication depth to 1 */
database->server->depth = 1;
} else {
}
else
{
/* Avoid any possible Master/Slave stale state */
monitor_clear_pending_status(database, SERVER_SLAVE);
monitor_clear_pending_status(database, SERVER_MASTER);
@ -598,15 +629,19 @@ detect_stale_master = handle->detectStaleMaster;
ptr = mon->databases;
while (ptr)
{
if (! SERVER_IN_MAINT(ptr->server)) {
if (!SERVER_IN_MAINT(ptr->server))
{
/* If "detect_stale_master" option is On, let's use the previus master */
if (detect_stale_master && root_master && (!strcmp(ptr->server->name, root_master->server->name) && ptr->server->port == root_master->server->port) && (ptr->server->status & SERVER_MASTER) && !(ptr->pending_status & SERVER_MASTER)) {
if (detect_stale_master && root_master && (!strcmp(ptr->server->name, root_master->server->name) && ptr->server->port == root_master->server->port) && (ptr->server->status & SERVER_MASTER) && !(ptr->pending_status & SERVER_MASTER))
{
/* in this case server->status will not be updated from pending_status */
LOGIF(LM, (skygw_log_write_flush(
LOGFILE_MESSAGE, "[mysql_mon]: root server [%s:%i] is no longer Master, let's use it again even if it could be a stale master, you have been warned!", ptr->server->name, ptr->server->port)));
/* Set the STALE bit for this server in server struct */
server_set_status(ptr->server, SERVER_STALE_STATUS);
} else {
}
else
{
ptr->server->status = ptr->pending_status;
}
}
@ -663,7 +698,8 @@ MM_MONITOR *handle = (MM_MONITOR *)mon->handle;
* @return The server at root level with SERVER_MASTER bit
*/
static MONITOR_SERVERS *get_current_master(MONITOR *mon) {
static MONITOR_SERVERS *get_current_master(MONITOR *mon)
{
MM_MONITOR* handle = mon->handle;
MONITOR_SERVERS *ptr;
@ -675,12 +711,14 @@ MONITOR_SERVERS *ptr;
* that means SERVER_IS_RUNNING returns 0
* Let's check only for SERVER_IS_DOWN: server is not running
*/
if (SERVER_IS_DOWN(ptr->server)) {
if (SERVER_IS_DOWN(ptr->server))
{
ptr = ptr->next;
continue;
}
if (ptr->server->depth == 0) {
if (ptr->server->depth == 0)
{
handle->master = ptr;
}
@ -692,14 +730,20 @@ MONITOR_SERVERS *ptr;
* Return the root master
*/
if (handle->master != NULL) {
if (handle->master != NULL)
{
/* If the root master is in MAINT, return NULL */
if (SERVER_IN_MAINT(handle->master->server)) {
if (SERVER_IN_MAINT(handle->master->server))
{
return NULL;
} else {
}
else
{
return handle->master;
}
} else {
}
else
{
return NULL;
}
}
@ -718,6 +762,7 @@ static monitor_event_t mysql_events[] = {
NEW_SLAVE_EVENT,
MAX_MONITOR_EVENT
};
/**
* Check if the MM monitor is monitoring this event type.
* @param event Event to check
@ -729,7 +774,9 @@ bool isMySQLEvent(monitor_event_t event)
for (i = 0; mysql_events[i] != MAX_MONITOR_EVENT; i++)
{
if (event == mysql_events[i])
{
return true;
}
}
return false;
}