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

Updated dbshard with the new server reference changes.

Browse Source
This commit is contained in:
Markus Makela
2015-01-06 05:01:37 +02:00
parent fed828eb29
commit 6e17bf5ec1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/modules/routing/dbshard/dbshard.c
View File

@ -870,7 +870,7 @@ static ROUTER *
createInstance(SERVICE *service, char **options) createInstance(SERVICE *service, char **options)
{ {
ROUTER_INSTANCE* router; ROUTER_INSTANCE* router;
SERVER* server; SERVER_REF* server;
CONFIG_PARAMETER* conf; CONFIG_PARAMETER* conf;
int nservers; int nservers;
int i; int i;
@ -882,13 +882,13 @@ createInstance(SERVICE *service, char **options)
spinlock_init(&router->lock); spinlock_init(&router->lock);
/** Calculate number of servers */ /** Calculate number of servers */
server = service->databases; server = service->dbref;
nservers = 0; nservers = 0;
while (server != NULL) while (server != NULL)
{ {
nservers++; nservers++;
server=server->nextdb; server=server->next;
} }
router->servers = (BACKEND **)calloc(nservers + 1, sizeof(BACKEND *)); router->servers = (BACKEND **)calloc(nservers + 1, sizeof(BACKEND *));
@ -902,7 +902,7 @@ createInstance(SERVICE *service, char **options)
* maintain a count of the number of connections to each * maintain a count of the number of connections to each
* backend server. * backend server.
*/ */
server = service->databases; server = service->dbref;
nservers= 0; nservers= 0;
while (server != NULL) { while (server != NULL) {
@ -910,16 +910,16 @@ createInstance(SERVICE *service, char **options)
{ {
goto clean_up; goto clean_up;
} }
router->servers[nservers]->backend_server = server; router->servers[nservers]->backend_server = server->server;
router->servers[nservers]->backend_conn_count = 0; router->servers[nservers]->backend_conn_count = 0;
router->servers[nservers]->weight = 1; router->servers[nservers]->weight = 1;
router->servers[nservers]->be_valid = false; router->servers[nservers]->be_valid = false;
if(server->monuser == NULL && service->credentials.name != NULL) if(server->server->monuser == NULL && service->credentials.name != NULL)
{ {
router->servers[nservers]->backend_server->monuser = router->servers[nservers]->backend_server->monuser =
strdup(service->credentials.name); strdup(service->credentials.name);
} }
if(server->monpw == NULL && service->credentials.authdata != NULL) if(server->server->monpw == NULL && service->credentials.authdata != NULL)
{ {
router->servers[nservers]->backend_server->monpw = router->servers[nservers]->backend_server->monpw =
strdup(service->credentials.authdata); strdup(service->credentials.authdata);
@ -929,7 +929,7 @@ createInstance(SERVICE *service, char **options)
router->servers[nservers]->be_chk_tail = CHK_NUM_BACKEND; router->servers[nservers]->be_chk_tail = CHK_NUM_BACKEND;
#endif #endif
nservers += 1; nservers += 1;
server = server->nextdb; server = server->next;
} }
router->servers[nservers] = NULL; router->servers[nservers] = NULL;