diff options
author | guybe7 <guy.benoish@redislabs.com> | 2022-12-20 13:21:50 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-20 09:51:50 +0200 |
commit | 9c7c6924a019b902996fc4b608541f475daa649d (patch) | |
tree | dbf8d847864a1a363e5e9cbb984fad82b4c491d3 /src/expire.c | |
parent | 669688a342d5c1697c737b23f456e1750b46f0ff (diff) | |
download | redis-9c7c6924a019b902996fc4b608541f475daa649d.tar.gz |
Cleanup: Get rid of server.core_propagates (#11572)
1. Get rid of server.core_propagates - we can just rely on module/call nesting levels
2. Rename in_nested_call to execution_nesting and update the comment
3. Remove module_ctx_nesting (redundant, we can use execution_nesting)
4. Modify postExecutionUnitOperations according to the comment (The main purpose of this PR)
5. trackingHandlePendingKeyInvalidations: Check the nesting level inside this function
Diffstat (limited to 'src/expire.c')
-rw-r--r-- | src/expire.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/expire.c b/src/expire.c index 17df22205..7b6b3bc9c 100644 --- a/src/expire.c +++ b/src/expire.c @@ -182,11 +182,8 @@ void activeExpireCycle(int type) { long total_sampled = 0; long total_expired = 0; - /* Sanity: There can't be any pending commands to propagate when - * we're in cron */ + /* Try to smoke-out bugs (server.also_propagate should be empty here) */ serverAssert(server.also_propagate.numops == 0); - server.core_propagates = 1; - server.in_nested_call++; for (j = 0; j < dbs_per_call && timelimit_exit == 0; j++) { /* Expired and checked in a single loop. */ @@ -312,11 +309,6 @@ void activeExpireCycle(int type) { (expired*100/sampled) > config_cycle_acceptable_stale); } - serverAssert(server.core_propagates); /* This function should not be re-entrant */ - - server.core_propagates = 0; - server.in_nested_call--; - elapsed = ustime()-start; server.stat_expire_cycle_time_used += elapsed; latencyAddSampleIfNeeded("expire-cycle",elapsed/1000); |