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

Fixed compile errors

Browse Source 
Fixed compile errors
This commit is contained in:
MassimilianoPinto
2014-06-24 18:37:17 +02:00
parent dfe3092dc5
commit e1e172fe03
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/include/server.h
View File

@ -71,8 +71,9 @@ typedef struct server {
long node_id; /**< Node id, server_id for M/S or local_index for Galera */ long node_id; /**< Node id, server_id for M/S or local_index for Galera */
int rlag; /**< Replication Lag for Master / Slave replication */ int rlag; /**< Replication Lag for Master / Slave replication */
unsigned long node_ts; /**< Last timestamp set from M/S monitor module */ unsigned long node_ts; /**< Last timestamp set from M/S monitor module */
int depth; /**< Replication level in the tree */
int master_id; /**< Master server id of this node */ int master_id; /**< Master server id of this node */
int depth; /**< Replication level in the tree */
char slaves[100]; /**< Slaves of this node */
} SERVER; } SERVER;
/** /**

8
server/modules/monitor/mysql_mon.c
View File

@ -386,8 +386,8 @@ static int conn_err_count;
server_clear_status(database->server, SERVER_RUNNING); server_clear_status(database->server, SERVER_RUNNING);
/* clear M/S status */ /* clear M/S status */
server_clear_status(ptr->server, SERVER_SLAVE); server_clear_status(database->server, SERVER_SLAVE);
server_clear_status(ptr->server, SERVER_MASTER); server_clear_status(database->server, SERVER_MASTER);
return; return;
} }
@ -476,7 +476,7 @@ static int conn_err_count;
} }
} }
/* store master_id of current node */ /* store master_id of current node */
memcpy(&database->server->master_id, &master_server_id, sizeof(int)); memcpy(&database->server->master_id, &master_id, sizeof(int));
mysql_free_result(result); mysql_free_result(result);
} }
@ -872,7 +872,7 @@ static void set_slave_heartbeat(MYSQL_MONITOR *handle, MONITOR_SERVERS *database
database->server->rlag = -1; database->server->rlag = -1;
database->server->node_ts = 0; database->server->node_ts = 0;
if (handle->master->node_id < 0) { if (handle->master->server->node_id < 0) {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"[mysql_mon]: error: replication heartbeat: " "[mysql_mon]: error: replication heartbeat: "

21
server/modules/monitor/mysqlmon.h
View File

@ -31,6 +31,7 @@
* 08/07/13 Mark Riddoch Initial implementation * 08/07/13 Mark Riddoch Initial implementation
* 26/05/14 Massimiliano Pinto Default values for MONITOR_INTERVAL * 26/05/14 Massimiliano Pinto Default values for MONITOR_INTERVAL
* 28/05/14 Massimiliano Pinto Addition of new fields in MYSQL_MONITOR struct * 28/05/14 Massimiliano Pinto Addition of new fields in MYSQL_MONITOR struct
* 24/06/14 Massimiliano Pinto Addition of master field in MYSQL_MONITOR struct
* *
* @endverbatim * @endverbatim
*/ */
@ -52,17 +53,17 @@ typedef struct monitor_servers {
* The handle for an instance of a MySQL Monitor module * The handle for an instance of a MySQL Monitor module
*/ */
typedef struct { typedef struct {
SPINLOCK lock; /**< The monitor spinlock */ SPINLOCK lock; /**< The monitor spinlock */
pthread_t tid; /**< id of monitor thread */ pthread_t tid; /**< id of monitor thread */
int shutdown; /**< Flag to shutdown the monitor thread */ int shutdown; /**< Flag to shutdown the monitor thread */
int status; /**< Monitor status */ int status; /**< Monitor status */
char *defaultUser; /**< Default username for monitoring */ char *defaultUser; /**< Default username for monitoring */
char *defaultPasswd; /**< Default password for monitoring */ char *defaultPasswd; /**< Default password for monitoring */
unsigned long interval; /**< Monitor sampling interval */ unsigned long interval; /**< Monitor sampling interval */
unsigned long id; /**< Monitor ID */ unsigned long id; /**< Monitor ID */
int replicationHeartbeat; /**< Monitor flag for MySQL replication heartbeat */ int replicationHeartbeat; /**< Monitor flag for MySQL replication heartbeat */
int master_id; /**< Master server-id for MySQL Master/Slave replication */ MONITOR_SERVERS *master; /**< Master server for MySQL Master/Slave replication */
MONITOR_SERVERS *databases; /**< Linked list of servers to monitor */ MONITOR_SERVERS *databases; /**< Linked list of servers to monitor */
} MYSQL_MONITOR; } MYSQL_MONITOR;
#define MONITOR_RUNNING 1 #define MONITOR_RUNNING 1