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

Fix avrorouter and cluster usage

Browse Source 
The servers defined by `cluster` wouldn't get used.
This commit is contained in:
Markus Mäkelä
2019-06-26 10:05:21 +03:00
parent 59e7b2b09d
commit 01822490ca
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/maxscale/config.hh
View File

@ -114,6 +114,7 @@ extern const char CN_CACHE_SIZE[];
extern const char CN_CACHE[]; extern const char CN_CACHE[];
extern const char CN_CLASSIFICATION[]; extern const char CN_CLASSIFICATION[];
extern const char CN_CLASSIFY[]; extern const char CN_CLASSIFY[];
extern const char CN_CLUSTER[];
extern const char CN_CONNECTION_TIMEOUT[]; extern const char CN_CONNECTION_TIMEOUT[];
extern const char CN_DATA[]; extern const char CN_DATA[];
extern const char CN_DEFAULT[]; extern const char CN_DEFAULT[];

2
server/modules/routing/avrorouter/avro.cc
View File

@ -133,7 +133,7 @@ Avro::Avro(SERVICE* service, MXS_CONFIG_PARAMETER* params, SERVICE* source, SRow
, handler(service, handler, params->get_compiled_regex("match", 0, NULL).release(), , handler(service, handler, params->get_compiled_regex("match", 0, NULL).release(),
params->get_compiled_regex("exclude", 0, NULL).release()) params->get_compiled_regex("exclude", 0, NULL).release())
{ {
if (params->contains(CN_SERVERS)) if (params->contains(CN_SERVERS) || params->contains(CN_CLUSTER))
{ {
MXS_NOTICE("Replicating directly from a master server"); MXS_NOTICE("Replicating directly from a master server");
cdc::Config cnf; cdc::Config cnf;

2
server/modules/routing/avrorouter/avro_main.cc
View File

@ -68,7 +68,7 @@ MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params)
Avro* router = Avro::create(service, handler); Avro* router = Avro::create(service, handler);
if (router && !params->contains(CN_SERVERS)) if (router && !params->contains(CN_SERVERS) && !params->contains(CN_CLUSTER))
{ {
conversion_task_ctl(router, true); conversion_task_ctl(router, true);
} }