aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3987 from sysown/v2.x-fix_digest_purge_rwlocks

Browse Source 
Fix invalid memory accesses to digests due to concurrent purge
pull/3978/head^2
René Cannaò 4 years ago committed by GitHub
parent 90f51d50ca 1f063f704d
commit f0799a43d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
lib/Query_Processor.cpp
Unescape View File

@ -1029,7 +1029,7 @@ unsigned long long Query_Processor::purge_query_digests(bool async_purge, bool p
unsigned long long Query_Processor::purge_query_digests_async(char **msg) {
unsigned long long ret = 0;
pthread_rwlock_rdlock(&digest_rwlock);
pthread_rwlock_wrlock(&digest_rwlock);
unsigned long long curtime1=monotonic_time();
size_t map1_size = digest_umap.size();
size_t map2_size = digest_text_umap.size();
@ -1077,7 +1077,7 @@ unsigned long long Query_Processor::purge_query_digests_async(char **msg) {
unsigned long long Query_Processor::purge_query_digests_sync(bool parallel) {
unsigned long long ret = 0;
pthread_rwlock_rdlock(&digest_rwlock);
pthread_rwlock_wrlock(&digest_rwlock);
size_t map_size = digest_umap.size();
if (parallel && map_size >= DIGEST_STATS_FAST_MINSIZE) { // parallel purge
int n=DIGEST_STATS_FAST_THREADS;

Write Preview
Loading…
Cancel
Save