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

Fix to bug 679: http://bugs.mariadb.com/show_bug.cgi?id=679

Browse Source 
Added server references to services instead of using a raw pointers to server instances.
Changed all references to service->database to service->dbref.
This commit is contained in:
Markus Makela
2015-01-02 20:28:26 +02:00
parent ef19b9e729
commit 95cd0b93cb
8 changed files with 68 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/core/dbusers.c
View File

@ -451,7 +451,7 @@ getUsers(SERVICE *service, USERS *users)
char *service_passwd = NULL;
char *dpwd;
int total_users = 0;
SERVER *server;
SERVER_REF *server;
char *users_query;
unsigned char hash[SHA_DIGEST_LENGTH]="";
char *users_data = NULL;
@ -505,12 +505,12 @@ getUsers(SERVICE *service, USERS *users)
* out of databases
* to try
*/
server = service->databases;
server = service->dbref;
dpwd = decryptPassword(service_passwd);
/* Select a server with Master bit, if available */
while (server != NULL && !(server->status & SERVER_MASTER)) {
server = server->nextdb;
while (server != NULL && !(server->server->status & SERVER_MASTER)) {
server = server->next;
}
if (service->svc_do_shutdown)
@ -523,35 +523,35 @@ getUsers(SERVICE *service, USERS *users)
/* Try loading data from master server */
if (server != NULL &&
(mysql_real_connect(con,
server->name, service_user,
server->server->name, service_user,
dpwd,
NULL,
server->port,
server->server->port,
NULL, 0) != NULL))
{
LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG,
"Dbusers : Loading data from backend database with "
"Master role [%s:%i] for service [%s]",
server->name,
server->port,
server->server->name,
server->server->port,
service->name)));
} else {
/* load data from other servers via loop */
server = service->databases;
server = service->dbref;
while (!service->svc_do_shutdown &&
server != NULL &&
(mysql_real_connect(con,
server->name,
server->server->name,
service_user,
dpwd,
NULL,
server->port,
server->server->port,
NULL,
0) == NULL))
{
server = server->nextdb;
server = server->next;
}
if (service->svc_do_shutdown)
@ -566,8 +566,8 @@ getUsers(SERVICE *service, USERS *users)
LOGFILE_DEBUG,
"Dbusers : Loading data from backend database "
"[%s:%i] for service [%s]",
server->name,
server->port,
server->server->name,
server->server->port,
service->name)));
}
}

40
server/core/service.c
View File

@ -474,7 +474,7 @@ int
service_free(SERVICE *service)
{
SERVICE *ptr;
SERVER_REF *srv;
if (service->stats.n_current)
return 0;
/* First of all remove from the linked list */
@ -496,6 +496,13 @@ SERVICE *ptr;
spinlock_release(&service_spin);
/* Clean up session and free the memory */
while(service->dbref){
srv = service->dbref;
service->dbref = service->dbref->next;
free(srv);
}
free(service->name);
free(service->routerModule);
if (service->credentials.name)
@ -574,8 +581,13 @@ void
serviceAddBackend(SERVICE *service, SERVER *server)
{
spinlock_acquire(&service->spin);
server->nextdb = service->databases;
service->databases = server;
SERVER_REF *sref;
if((sref = calloc(1,sizeof(SERVER_REF))) != NULL)
{
sref->next = service->dbref;
sref->server = server;
service->dbref = sref;
}
spinlock_release(&service->spin);
}
@ -589,12 +601,12 @@ serviceAddBackend(SERVICE *service, SERVER *server)
int
serviceHasBackend(SERVICE *service, SERVER *server)
{
SERVER *ptr;
SERVER_REF *ptr;
spinlock_acquire(&service->spin);
ptr = service->databases;
while (ptr && ptr != server)
ptr = ptr->nextdb;
ptr = service->dbref;
while (ptr && ptr->server != server)
ptr = ptr->next;
spinlock_release(&service->spin);
return ptr != NULL;
@ -812,7 +824,7 @@ SERVICE *service;
void
printService(SERVICE *service)
{
SERVER *ptr = service->databases;
SERVER_REF *ptr = service->dbref;
struct tm result;
char time_buf[30];
int i;
@ -825,8 +837,8 @@ int i;
printf("\tBackend databases\n");
while (ptr)
{
printf("\t\t%s:%d Protocol: %s\n", ptr->name, ptr->port, ptr->protocol);
ptr = ptr->nextdb;
printf("\t\t%s:%d Protocol: %s\n", ptr->server->name, ptr->server->port, ptr->server->protocol);
ptr = ptr->next;
}
if (service->n_filters)
{
@ -893,7 +905,7 @@ SERVICE *ptr;
*/
void dprintService(DCB *dcb, SERVICE *service)
{
SERVER *server = service->databases;
SERVER_REF *server = service->dbref;
struct tm result;
char timebuf[30];
int i;
@ -937,9 +949,9 @@ int i;
dcb_printf(dcb, "\tBackend databases\n");
while (server)
{
dcb_printf(dcb, "\t\t%s:%d Protocol: %s\n", server->name, server->port,
server->protocol);
server = server->nextdb;
dcb_printf(dcb, "\t\t%s:%d Protocol: %s\n", server->server->name, server->server->port,
server->server->protocol);
server = server->next;
}
if (service->weightby)
dcb_printf(dcb, "\tRouting weight parameter: %s\n",