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

Fixed concurrency issues in tee.

Browse Source 
tee.c: added a spinlock to the session which is used in clientReply
This commit is contained in:
Markus Makela
2015-01-02 16:21:21 +02:00
parent ed961b5d1b
commit ef19b9e729
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/filter/tee.c
View File

@ -163,6 +163,7 @@ typedef struct {
int n_rejected; /* Number of rejected queries */ int n_rejected; /* Number of rejected queries */
int residual; /* Any outstanding SQL text */ int residual; /* Any outstanding SQL text */
GWBUF* tee_replybuf; /* Buffer for reply */ GWBUF* tee_replybuf; /* Buffer for reply */
SPINLOCK tee_lock;
} TEE_SESSION; } TEE_SESSION;
typedef struct orphan_session_tt typedef struct orphan_session_tt
@ -381,7 +382,7 @@ char *remote, *userName;
{ {
my_session->active = 1; my_session->active = 1;
my_session->residual = 0; my_session->residual = 0;
spinlock_init(&my_session->tee_lock);
if (my_instance->source && if (my_instance->source &&
(remote = session_get_remote(session)) != NULL) (remote = session_get_remote(session)) != NULL)
{ {
@ -829,6 +830,8 @@ clientReply (FILTER* instance, void *session, GWBUF *reply)
int rc; int rc;
TEE_SESSION *my_session = (TEE_SESSION *) session; TEE_SESSION *my_session = (TEE_SESSION *) session;
spinlock_acquire(&my_session->tee_lock);
ss_dassert(my_session->active); ss_dassert(my_session->active);
my_session->replies++; my_session->replies++;
@ -856,7 +859,9 @@ clientReply (FILTER* instance, void *session, GWBUF *reply)
else else
{ {
rc = 1; rc = 1;
} }
spinlock_release(&my_session->tee_lock);
return rc; return rc;
} }
/** /**