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

master_id, depth, slaves default values

Browse Source 
master_id, depth, slaves default values
This commit is contained in:
MassimilianoPinto
2014-06-23 09:51:50 +02:00
parent 2a1688bb3d
commit 7ba64875ad
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/server.c
View File

@ -28,6 +28,7 @@
* 20/05/14 Massimiliano Pinto Addition of server_string * 20/05/14 Massimiliano Pinto Addition of server_string
* 21/05/14 Massimiliano Pinto Addition of node_id * 21/05/14 Massimiliano Pinto Addition of node_id
* 28/05/14 Massimiliano Pinto Addition of rlagd and node_ts fields * 28/05/14 Massimiliano Pinto Addition of rlagd and node_ts fields
* 20/06/14 Massimiliano Pinto Addition of master_id, depth, slaves fields
* *
* @endverbatim * @endverbatim
*/ */
@ -76,6 +77,9 @@ SERVER *server;
server->node_id = -1; server->node_id = -1;
server->rlag = -1; server->rlag = -1;
server->node_ts = 0; server->node_ts = 0;
server->master_id = -1;
server->depth = -1;
*server->slaves = '\0';
spinlock_acquire(&server_spin); spinlock_acquire(&server_spin);
server->next = allServers; server->next = allServers;

15
server/include/server.h
View File

@ -36,6 +36,7 @@
* 20/05/14 Massimiliano Pinto Addition of node_id field * 20/05/14 Massimiliano Pinto Addition of node_id field
* 23/05/14 Massimiliano Pinto Addition of rlag and node_ts fields * 23/05/14 Massimiliano Pinto Addition of rlag and node_ts fields
* 03/06/14 Mark Riddoch Addition of maintainance mode * 03/06/14 Mark Riddoch Addition of maintainance mode
* 20/06/14 Massimiliano Pinto Addition of master_id, depth, slaves fields
* *
* @endverbatim * @endverbatim
*/ */
@ -79,11 +80,12 @@ typedef struct server {
* *
* These are a bitmap of attributes that may be applied to a server * These are a bitmap of attributes that may be applied to a server
*/ */
#define SERVER_RUNNING 0x0001 /**<< The server is up and running */ #define SERVER_RUNNING 0x0001 /**<< The server is up and running */
#define SERVER_MASTER 0x0002 /**<< The server is a master, i.e. can handle writes */ #define SERVER_MASTER 0x0002 /**<< The server is a master, i.e. can handle writes */
#define SERVER_SLAVE 0x0004 /**<< The server is a slave, i.e. can handle reads */ #define SERVER_SLAVE 0x0004 /**<< The server is a slave, i.e. can handle reads */
#define SERVER_JOINED 0x0008 /**<< The server is joined in a Galera cluster */ #define SERVER_JOINED 0x0008 /**<< The server is joined in a Galera cluster */
#define SERVER_MAINT 0x1000 /**<< Server is in maintenance mode */ #define SERVER_MAINT 0x1000 /**<< Server is in maintenance mode */
#define SERVER_SLAVE_OF_EXT_MASTER 0x1002 /**<< Server is slave of a Master outside the provided replication topology */
/** /**
* Is the server running - the macro returns true if the server is marked as running * Is the server running - the macro returns true if the server is marked as running
@ -124,6 +126,9 @@ typedef struct server {
#define SERVER_IS_IN_CLUSTER(s) (((s)->status & (SERVER_MASTER|SERVER_SLAVE|SERVER_JOINED)) != 0) #define SERVER_IS_IN_CLUSTER(s) (((s)->status & (SERVER_MASTER|SERVER_SLAVE|SERVER_JOINED)) != 0)
#define SERVER_IS_RELAY_SERVER(server) \
(((server)->status & (SERVER_RUNNING|SERVER_MASTER|SERVER_SLAVE|SERVER_MAINT)) == (SERVER_RUNNING|SERVER_MASTER|SERVER_SLAVE))
extern SERVER *server_alloc(char *, char *, unsigned short); extern SERVER *server_alloc(char *, char *, unsigned short);
extern int server_free(SERVER *); extern int server_free(SERVER *);
extern SERVER *server_find_by_unique_name(char *); extern SERVER *server_find_by_unique_name(char *);