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

Removed 'information_schema' from the sharding checks and set the default weights of the backend to 1.

Browse Source
This commit is contained in:
Markus Makela
2014-12-01 15:02:44 +02:00
parent 66164aa664
commit 1135b2c23f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,8 +352,8 @@ static void* hfree(void* fval)
*/ */
bool update_dbnames_hash(BACKEND** backends, HASHTABLE* hashtable) bool update_dbnames_hash(BACKEND** backends, HASHTABLE* hashtable)
{ {
const unsigned int connect_timeout = 5; const unsigned int connect_timeout = 15;
const unsigned int read_timeout = 2; const unsigned int read_timeout = 10;
bool rval = true; bool rval = true;
SERVER* server; SERVER* server;
MYSQL* handle; MYSQL* handle;
@ -430,6 +430,9 @@ bool update_dbnames_hash(BACKEND** backends, HASHTABLE* hashtable)
char *dbnm = NULL,*servnm = NULL; char *dbnm = NULL,*servnm = NULL;
lengths = mysql_fetch_lengths(result); lengths = mysql_fetch_lengths(result);
if(strncmp(row[0],"information_schema",lengths[0]) == 0){
continue;
}
dbnm = (char*)calloc(lengths[0] + 1,sizeof(char)); dbnm = (char*)calloc(lengths[0] + 1,sizeof(char));
memcpy(dbnm,row[0],lengths[0]); memcpy(dbnm,row[0],lengths[0]);
servnm = strdup(server->unique_name); servnm = strdup(server->unique_name);
@ -734,6 +737,7 @@ createInstance(SERVICE *service, char **options)
} }
router->servers[nservers]->backend_server = server; router->servers[nservers]->backend_server = server;
router->servers[nservers]->backend_conn_count = 0; router->servers[nservers]->backend_conn_count = 0;
router->servers[nservers]->weight = 1;
router->servers[nservers]->be_valid = false; router->servers[nservers]->be_valid = false;
#if defined(SS_DEBUG) #if defined(SS_DEBUG)
router->servers[nservers]->be_chk_top = CHK_NUM_BACKEND; router->servers[nservers]->be_chk_top = CHK_NUM_BACKEND;