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

Removed invalid assertion from readwritesplit.c

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-10 17:05:40 +02:00
parent 9a5168c3e8
commit 24c1106abf
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -833,13 +833,13 @@ static void* newSession(
succp = rses_begin_locked_router_action(client_rses); succp = rses_begin_locked_router_action(client_rses);
if(!succp){ if(!succp)
{
free(client_rses->rses_backend_ref); free(client_rses->rses_backend_ref);
free(client_rses); free(client_rses);
client_rses = NULL; client_rses = NULL;
goto return_rses; goto return_rses;
} }
succp = select_connect_backend_servers(&master_ref, succp = select_connect_backend_servers(&master_ref,
backend_ref, backend_ref,
router_nservers, router_nservers,
@ -2835,8 +2835,10 @@ static bool select_connect_backend_servers(
(max_slave_rlag == MAX_RLAG_UNDEFINED || (max_slave_rlag == MAX_RLAG_UNDEFINED ||
(b->backend_server->rlag != MAX_RLAG_NOT_AVAILABLE && (b->backend_server->rlag != MAX_RLAG_NOT_AVAILABLE &&
b->backend_server->rlag <= max_slave_rlag)) && b->backend_server->rlag <= max_slave_rlag)) &&
(SERVER_IS_SLAVE(b->backend_server) || SERVER_IS_RELAY_SERVER(b->backend_server)) && (SERVER_IS_SLAVE(b->backend_server) ||
(master_host != NULL && (b->backend_server != master_host->backend_server))) SERVER_IS_RELAY_SERVER(b->backend_server)) &&
(master_host != NULL &&
(b->backend_server != master_host->backend_server)))
{ {
slaves_found += 1; slaves_found += 1;
@ -2898,9 +2900,12 @@ static bool select_connect_backend_servers(
else if (master_host && else if (master_host &&
(b->backend_server == master_host->backend_server)) (b->backend_server == master_host->backend_server))
{ {
/** not allowed to replace old master with new */ /**
ss_dassert(*p_master_ref == NULL); * *p_master_ref must be assigned with this
* backend_ref pointer because its original value
* may have been lost when backend references were
* sorted (qsort).
*/
*p_master_ref = &backend_ref[i]; *p_master_ref = &backend_ref[i];
if (master_connected) if (master_connected)