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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Johan Wikman
2019-09-17 14:55:34 +03:00
parent 7741fddb4b dabab543cc
commit 1f26189ddd
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/dcb.cc
View File

@ -350,6 +350,12 @@ DCB* dcb_connect(SERVER* srv, MXS_SESSION* session, const char* protocol)
dcb->last_read = mxs_clock(); dcb->last_read = mxs_clock();
dcb->last_write = mxs_clock(); dcb->last_write = mxs_clock();
mxb::atomic::add(&server->stats.n_from_pool, 1, mxb::atomic::RELAXED); mxb::atomic::add(&server->stats.n_from_pool, 1, mxb::atomic::RELAXED);
/* All callbacks were removed when the dcb was put into the pool. */
if (DCB_THROTTLING_ENABLED(dcb))
{
dcb_add_callback(dcb, DCB_REASON_HIGH_WATER, upstream_throttle_callback, NULL);
dcb_add_callback(dcb, DCB_REASON_LOW_WATER, upstream_throttle_callback, NULL);
}
return dcb; return dcb;
} }
else else