gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Extend freeSlotsToKeysMapAsync and freeTrackingRadixTreeAsync to check LAZYFREE_THRESHOLD. (#8969)

Browse Source 
Without this fix, FLUSHALL ASYNC would have freed these in a background thread,
even if they didn't contain many elements (unlike how it works with other structures), which could be inefficient.
This commit is contained in:
Binbin 2021-05-30 22:56:04 +08:00 committed by GitHub
parent 58a03eca67
commit 01495c674a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lazyfree.c
View File

@ -48,6 +48,7 @@ void lazyFreeTrackingTable(void *args[]) {
atomicIncr(lazyfreed_objects,len); atomicIncr(lazyfreed_objects,len);
} }
/* Release the lua_scripts dict. */
void lazyFreeLuaScripts(void *args[]) { void lazyFreeLuaScripts(void *args[]) {
dict *lua_scripts = args[0]; dict *lua_scripts = args[0];
long long len = dictSize(lua_scripts); long long len = dictSize(lua_scripts);
@ -212,16 +213,28 @@ void emptyDbAsync(redisDb *db) {
bioCreateLazyFreeJob(lazyfreeFreeDatabase,2,oldht1,oldht2); bioCreateLazyFreeJob(lazyfreeFreeDatabase,2,oldht1,oldht2);
} }
/* Release the radix tree mapping Redis Cluster keys to slots asynchronously. */ /* Release the radix tree mapping Redis Cluster keys to slots.
* If the rax is huge enough, free it in async way. */
void freeSlotsToKeysMapAsync(rax *rt) { void freeSlotsToKeysMapAsync(rax *rt) {
atomicIncr(lazyfree_objects,rt->numele); /* Because this rax has only keys and no values so we use numnodes. */
bioCreateLazyFreeJob(lazyfreeFreeSlotsMap,1,rt); if (rt->numnodes > LAZYFREE_THRESHOLD) {
atomicIncr(lazyfree_objects,rt->numele);
bioCreateLazyFreeJob(lazyfreeFreeSlotsMap,1,rt);
} else {
raxFree(rt);
}
} }
/* Free an object, if the object is huge enough, free it in async way. */ /* Free the key tracking table.
* If the table is huge enough, free it in async way. */
void freeTrackingRadixTreeAsync(rax *tracking) { void freeTrackingRadixTreeAsync(rax *tracking) {
atomicIncr(lazyfree_objects,tracking->numele); /* Because this rax has only keys and no values so we use numnodes. */
bioCreateLazyFreeJob(lazyFreeTrackingTable,1,tracking); if (tracking->numnodes > LAZYFREE_THRESHOLD) {
atomicIncr(lazyfree_objects,tracking->numele);
bioCreateLazyFreeJob(lazyFreeTrackingTable,1,tracking);
} else {
freeTrackingRadixTree(tracking);
}
} }
/* Free lua_scripts dict, if the dict is huge enough, free it in async way. */ /* Free lua_scripts dict, if the dict is huge enough, free it in async way. */