upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 07:42:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move the dns_db_setloop into cache_create_db()

Browse source 
The dns_cache_flush() drops the old database and creates a new one, but
it forgets to pass the loop that runs the node pruning and cleaning
the rbtdb when flushing it next time.  This causes the cleaning to skip
cleaning the parent nodes (with .down == NULL) leading to increased
memory usage over time until the database is unable to keep up and just
stays overmem all the time.
This commit is contained in:
Ondřej Surý 2024-03-06 18:14:32 +01:00
parent 58b5ef6f2a
commit d492d676ef
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/dns/cache.c
View file

@ -68,6 +68,7 @@ struct dns_cache {
isc_mutex_t lock;
isc_mem_t *mctx; /* Main cache memory */
isc_mem_t *hmctx; /* Heap memory */
isc_loop_t *loop;
char *name;
isc_refcount_t references;
@ -101,6 +102,9 @@ cache_create_db(dns_cache_t *cache, dns_db_t **db) {
dns_db_setservestalettl(*db, cache->serve_stale_ttl);
dns_db_setservestalerefresh(*db, cache->serve_stale_refresh);
}
dns_db_setloop(cache->db, cache->loop);
return (result);
}
@ -137,6 +141,7 @@ dns_cache_create(isc_loopmgr_t *loopmgr, dns_rdataclass_t rdclass,
.hmctx = hmctx,
.rdclass = rdclass,
.name = isc_mem_strdup(mctx, cachename),
.loop = isc_loop_ref(isc_loop_main(loopmgr)),
};
isc_mutex_init(&cache->lock);
@ -174,6 +179,7 @@ cleanup_stats:
isc_stats_detach(&cache->stats);
isc_mutex_destroy(&cache->lock);
isc_mem_free(mctx, cache->name);
isc_loop_detach(&cache->loop);
isc_mem_detach(&cache->hmctx);
isc_mem_putanddetach(&cache->mctx, cache, sizeof(*cache));
return (result);
@ -192,6 +198,8 @@ cache_free(dns_cache_t *cache) {
isc_mutex_destroy(&cache->lock);
isc_loop_detach(&cache->loop);
cache->magic = 0;
isc_mem_detach(&cache->hmctx);
isc_mem_putanddetach(&cache->mctx, cache, sizeof(*cache));