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

MXS-2196: Allocate a session before allocating DCBs

Browse Source 
Allocating the session before a DCB guarantees that at no point will a DCB
have a null session. This further clarifies the concept of the session and
also allows the listener reference to be moved there.

Ideally, the session itself would allocate and assign the client DCB but
since the Listener is the only one who does it, it's acceptable for now.
This commit is contained in:
Markus Mäkelä
2018-12-03 19:25:26 +02:00
parent 692127a2cb
commit 43c33e9f4a
20 changed files with 106 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,8 @@
#include <maxscale/session.hh>
#include <maxscale/utils.h>
#include "../../../core/internal/session.hh"
static GWBUF* blr_make_query(DCB* dcb, char* query);
static GWBUF* blr_make_registration(ROUTER_INSTANCE* router);
static GWBUF* blr_make_binlog_dump(ROUTER_INSTANCE* router);
@ -186,7 +188,8 @@ static void blr_start_master(void* data)
pthread_mutex_unlock(&router->lock);
DCB* client = dcb_alloc(DCB_ROLE_INTERNAL, NULL, NULL);
// TODO: Fix this
DCB* client = dcb_alloc(DCB_ROLE_INTERNAL, NULL);
/* Create fake 'client' DCB */
if (client == NULL)
@ -201,7 +204,8 @@ static void blr_start_master(void* data)
/* Create MySQL Athentication from configured user/passwd */
client->data = CreateMySQLAuthData(router->user, router->password, "");
client->session = session_alloc(router->service, client);
// TODO: Fix this
client->session = new mxs::Session(nullptr);
router->session = client->session;
/* Create a session for dummy client DCB */
@ -210,7 +214,6 @@ static void blr_start_master(void* data)
MXS_ERROR("failed to create session for connection to master");
return;
}
client->service = router->service;
/**
* 'client' is the fake DCB that emulates a client session:
@ -237,7 +240,6 @@ static void blr_start_master(void* data)
return;
}
router->master->remote = MXS_STRDUP_A(router->service->dbref->server->address);
router->master->service = router->service;
MXS_NOTICE("%s: attempting to connect to master"
" server [%s]:%d, binlog='%s', pos=%lu%s%s",