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

Perform query classifier initialization implicitly

Browse Source 
The setting up and the initialization of the query classifier has
now been separated. The gateway explicitly sets up the query
classifier (i.e. chooses which one to use and what arguments to
provide), but the actual initialization is performed as part of
the general module initialization.
This commit is contained in:
Johan Wikman
2017-01-05 19:24:58 +02:00
parent 530c0e9617
commit 8fc5bdc2f1
13 changed files with 116 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/core/gateway.cc
View File

@ -976,26 +976,17 @@ void worker_thread_main(void* arg)
{
if (modules_thread_init())
{
if (qc_thread_init())
/** Init mysql thread context for use with a mysql handle and a parser */
if (mysql_thread_init() == 0)
{
/** Init mysql thread context for use with a mysql handle and a parser */
if (mysql_thread_init() == 0)
{
poll_waitevents(arg);
poll_waitevents(arg);
/** Release mysql thread context */
mysql_thread_end();
}
else
{
MXS_ERROR("Could not perform thread initialization for MySQL. Exiting thread.");
}
qc_thread_end();
/** Release mysql thread context */
mysql_thread_end();
}
else
{
MXS_ERROR("Could not perform thread initialization for query classifier. Exiting thread.");
MXS_ERROR("Could not perform thread initialization for MySQL. Exiting thread.");
}
modules_thread_finish();
@ -1875,7 +1866,7 @@ int main(int argc, char **argv)
cnf = config_get_global_options();
ss_dassert(cnf);
if (!qc_init(cnf->qc_name, cnf->qc_args))
if (!qc_setup(cnf->qc_name, cnf->qc_args))
{
const char* logerr = "Failed to initialise query classifier library.";
print_log_n_stderr(true, true, logerr, logerr, eno);
@ -2088,8 +2079,6 @@ int main(int argc, char **argv)
/** Release mysql thread context*/
mysql_thread_end();
qc_end();
utils_end();
cleanup_process_datadir();
MXS_NOTICE("MaxScale shutdown completed.");