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

Fix binlogrouter master reconnection

Browse Source 
The reconnection attempt to the master won't work if users aren't loaded
before it.
This commit is contained in:
Markus Mäkelä
2018-12-31 10:39:57 +02:00
parent 630165e52b
commit 54ae7119cf
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -190,9 +190,19 @@ static void blr_start_master(void* data)
// Create a temporary listener so we can create a session originating from it // Create a temporary listener so we can create a session originating from it
auto listener = Listener::create(router->service, "binlogrouter_listener", "mariadbclient", auto listener = Listener::create(router->service, "binlogrouter_listener", "mariadbclient",
"127.0.0.1", 9999, "", "", nullptr); "127.0.0.1", 9999, "", "", nullptr);
mxb_assert(listener);
// Load users now so that authentication will work for the fake client
listener->load_users();
router->session = new mxs::Session(listener); router->session = new mxs::Session(listener);
mxb_assert(router->session);
// Destroy the listener so it's not visible to the user
Listener::destroy(listener); Listener::destroy(listener);
router->client = dcb_alloc(DCB::Role::INTERNAL, router->session); router->client = dcb_alloc(DCB::Role::INTERNAL, router->session);
mxb_assert(router->client);
router->client->remote = MXS_STRDUP("127.0.0.1"); router->client->remote = MXS_STRDUP("127.0.0.1");
/* Fake the client is reading */ /* Fake the client is reading */
@ -210,7 +220,7 @@ static void blr_start_master(void* data)
router->session->client_dcb = router->client; router->session->client_dcb = router->client;
/* Create a session for dummy client DCB */ /* Create a session for dummy client DCB */
if (router->session == NULL || !session_start(router->session)) if (!session_start(router->session))
{ {
MXS_ERROR("failed to create session for connection to master"); MXS_ERROR("failed to create session for connection to master");
return; return;