Commit 183e1ace authored by Mark Andrews's avatar Mark Andrews
Browse files

fixup! fixup! fixup! fixup! Address TSAN is mark_header_stale

parent 2d0dea40
Pipeline #44433 failed with stages
in 29 minutes and 10 seconds
......@@ -3064,7 +3064,9 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rdatasetheader_t *header,
* were unable to obtain a write lock so we need to check
* rdh_ttl here.
*/
if (STALE(header) || (IS_CACHE(rbtdb) && header->rdh_ttl > now)) {
if (STALE(header) ||
(IS_CACHE(rbtdb) && !ACTIVE(header, now) && header->rdh_ttl > now))
{
rdataset->attributes |= DNS_RDATASETATTR_STALE;
rdataset->stale_ttl =
(rbtdb->serve_stale_ttl + header->rdh_ttl) - now;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment