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

Remove purged adb names and entries from SIEVE list immediately

Browse source 
Both `expire_name()` and `expire_entry()` use the isc_async mechanism to
remove names and entries from the SIEVE-LRU lists on the matching
isc_loop.

Under heavy load when the cleaning mechanism didn't have the chance to
kick in yet, this delay could lead to double-counting the purged names
and entries when purging the SIEVE-LRU lists during an overmem
condition.  This would result in insufficient memory being cleaned up,
causing the ADB to never recover from the overmem condition and leading
to an OOM crash of `named`.

This patch resolves the issue by bypassing the async queue and executing
the removal synchronously if the target loop matches the current
isc_loop().
This commit is contained in:
Ondřej Surý 2026-02-10 06:16:31 +01:00
parent 91286490c1
commit 46cfac0825
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/dns/adb.c
View file

@ -696,7 +696,12 @@ expire_name(dns_adbname_t *adbname, dns_adbstatus_t astat) {
/* Remove the adbname from the hashtable... */
if (cds_lfht_del(adb->names_ht, &adbname->ht_node) == 0) {
isc_async_run(adbname->loop, expire_name_async, adbname);
if (adbname->loop == isc_loop()) {
expire_name_async(adbname);
} else {
isc_async_run(adbname->loop, expire_name_async,
adbname);
}
}
}
@ -1467,7 +1472,12 @@ expire_entry(dns_adbentry_t *adbentry) {
dns_adb_t *adb = adbentry->adb;
if (cds_lfht_del(adb->entries_ht, &adbentry->ht_node) == 0) {
isc_async_run(adbentry->loop, expire_entry_async, adbentry);
if (adbentry->loop == isc_loop()) {
expire_entry_async(adbentry);
} else {
isc_async_run(adbentry->loop, expire_entry_async,
adbentry);
}
}
}