Skip to content

Commit

Permalink
Merge branch '2744-warning-checkhints-unable-to-get-root-ns-rrset-fro…
Browse files Browse the repository at this point in the history
…m-cache-not-found-9.18' into 'bind-9.18'

[9.18] Resolve "warning: checkhints: unable to get root NS rrset from cache: not found"

See merge request isc-projects/bind9!9080
  • Loading branch information
marka63 committed Jun 4, 2024
2 parents 2c5a130 + 455c262 commit 2c05f40
Show file tree
Hide file tree
Showing 5 changed files with 194 additions and 189 deletions.
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
6393. [func] Deal with uv_tcp_close_reset() error return codes
more gracefully. [GL #4708]

6392. [bug] Use a completely new memory context when flushing the
cache. [GL #2744]

6391. [bug] TCP client statistics could sometimes fail to decrease
when accepting client connection fails. [GL #4742]

Expand Down
12 changes: 1 addition & 11 deletions bin/named/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -4740,21 +4740,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
* view but is not yet configured. If it is not the
* view name but not a forward reference either, then it
* is simply a named cache that is not shared.
*
* We use two separate memory contexts for the
* cache, for the main cache memory and the heap
* memory.
*/
isc_mem_create(&cmctx);
isc_mem_setname(cmctx, "cache");
isc_mem_create(&hmctx);
isc_mem_setname(hmctx, "cache_heap");
CHECK(dns_cache_create(cmctx, hmctx, named_g_taskmgr,
CHECK(dns_cache_create(mctx, named_g_taskmgr,
named_g_timermgr, view->rdclass,
cachename, "rbt", 0, NULL,
&cache));
isc_mem_detach(&cmctx);
isc_mem_detach(&hmctx);
}
nsc = isc_mem_get(mctx, sizeof(*nsc));
nsc->cache = NULL;
Expand Down
Loading

0 comments on commit 2c05f40

Please sign in to comment.