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

MXS-2844: Fix binlogrouter destruction

Browse Source 
Binlogrouter services can now be destroyed at runtime.
This commit is contained in:
Markus Mäkelä 2020-02-13 10:30:52 +02:00
parent a09f291249
commit 912cb711e3
No known key found for this signature in database
GPG Key ID: 5CE746D557ACC499
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/service.cc
View File

@ -559,7 +559,7 @@ bool service_can_be_destroyed(Service* service)
{
bool rval = listener_find_by_service(service).empty();
if (rval)
if (rval && strcmp(service->router_name(), "binlogrouter") != 0)
{
for (auto s = service->dbref; s; s = s->next)
{

10
server/modules/routing/binlogrouter/blr.cc
View File

@ -812,9 +812,12 @@ static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params
{"authenticator", "MySQLBackendAuth"}
}, config_server_params);
Server* server = Server::server_alloc("binlog_router_master_host", params);
std::string my_name = "binlog_router_master_host_";
my_name += service->name();
if (server == NULL)
Server* server = Server::server_alloc(my_name.c_str(), params);
if (!server && !(server = Server::find_by_unique_name(my_name)))
{
MXS_ERROR("%s: Error for server_alloc in createInstance",
inst->service->name());
@ -2869,6 +2872,9 @@ static void destroyInstance(MXS_ROUTER* instance)
{
ROUTER_INSTANCE* inst = (ROUTER_INSTANCE*) instance;
std::string task_name = inst->service->name() + std::string(" stats");
hktask_remove(task_name.c_str());
MXS_DEBUG("Destroying instance of router %s for service %s",
inst->service->router_name(),
inst->service->name());