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

Completion to fix for http://bugs.skysql.com/show_bug.cgi?id=547

Browse Source 
server.h:added macro SERVER_IS_ROOT_MASTER for finding valid candidate for root master
readwritesplit.c: wrote open three if conditions in get_root_master_bref for clarity
This commit is contained in:
VilhoRaatikka
2014-09-16 14:49:04 +03:00
parent 7300e58787
commit 48c25155f5
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/include/server.h
View File

@ -123,7 +123,15 @@ typedef struct server {
*/ */
#define SERVER_IS_MASTER(server) \ #define SERVER_IS_MASTER(server) \
(((server)->status & (SERVER_RUNNING|SERVER_MASTER|SERVER_SLAVE|SERVER_MAINT)) == (SERVER_RUNNING|SERVER_MASTER)) (((server)->status & (SERVER_RUNNING|SERVER_MASTER|SERVER_SLAVE|SERVER_MAINT)) == (SERVER_RUNNING|SERVER_MASTER))
/** /**
* Is the server valid candidate for root master. The server must be running,
* marked as master and not have maintenance bit set.
*/
#define SERVER_IS_ROOT_MASTER(server) \
(((server)->status & (SERVER_RUNNING|SERVER_MASTER|SERVER_MAINT)) == (SERVER_RUNNING|SERVER_MASTER))
/**
* Is the server a slave? The server must be both running and marked as a slave * Is the server a slave? The server must be both running and marked as a slave
* in order for the macro to return true * in order for the macro to return true
*/ */

14
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -4382,13 +4382,17 @@ static backend_ref_t* get_root_master_bref(
while (i<rses->rses_nbackends) while (i<rses->rses_nbackends)
{ {
if (SERVER_IS_MASTER(bref->bref_backend->backend_server)) if ((bref->bref_backend->backend_server->status &
(SERVER_MASTER|SERVER_MAINT)) == SERVER_MASTER)
{ {
if (candidate_bref == NULL || if (bref->bref_backend->backend_server->status & SERVER_MASTER)
(bref->bref_backend->backend_server->depth <
candidate_bref->bref_backend->backend_server->depth))
{ {
candidate_bref = bref; if (candidate_bref == NULL ||
(bref->bref_backend->backend_server->depth <
candidate_bref->bref_backend->backend_server->depth))
{
candidate_bref = bref;
}
} }
} }
bref++; bref++;