ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[9.18] new: usr: Print the expiration time of the stale records

Browse Source 
Print the expiration time of the stale RRsets in the cache dump.

Backport of MR !10057

Merge branch 'backport-ondrej/print-expiration-time-of-stale-records-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!10062
This commit is contained in:
Ondřej Surý
2025-02-04 17:07:54 +00:00
parent 444af884b6 c9288ea3d7
commit f04168545d
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/tests/system/serve-stale/tests.sh
+2 -2
View File
@@ -115,8 +115,8 @@ sleep 2
# stale for somewhere between 3500-3599 seconds.
echo_i "check rndc dump stale data.example ($n)"
rndc_dumpdb ns1 || ret=1
awk '/; stale/ { x=$0; getline; print x, $0}' ns1/named_dump.db.test$n \
| grep "; stale data\.example.*3[56]...*TXT.*A text record with a 2 second ttl" >/dev/null 2>&1 || ret=1
awk '/; stale since [0-9]*/ { x=$0; getline; print x, $0}' ns1/named_dump.db.test$n \
| grep "; stale since [0-9]* data\.example.*3[56]...*TXT.*A text record with a 2 second ttl" >/dev/null 2>&1 || ret=1
# Also make sure the not expired data does not have a stale comment.
awk '/; authanswer/ { x=$0; getline; print x, $0}' ns1/named_dump.db.test$n \
| grep "; authanswer longttl\.example.*[56]...*TXT.*A text record with a 600 second ttl" >/dev/null 2>&1 || ret=1
lib/dns/include/dns/rdataset.h
+4 -1
View File
@@ -131,7 +131,10 @@ struct dns_rdataset {
* This RRSIG RRset should be re-generated around this time.
* Only valid if DNS_RDATASETATTR_RESIGN is set in attributes.
*/
isc_stdtime_t resign;
union {
isc_stdtime_t resign;
isc_stdtime_t expire;
};
/*@{*/
/*%
lib/dns/masterdump.c
+6 -1
View File
@@ -1155,7 +1155,12 @@ again:
} else {
isc_result_t result;
if (STALE(rds)) {
fprintf(f, "; stale\n");
isc_buffer_t b;
char buf[sizeof("YYYYMMDDHHMMSS")];
memset(buf, 0, sizeof(buf));
isc_buffer_init(&b, buf, sizeof(buf) - 1);
dns_time64_totext((uint64_t)rds->expire, &b);
fprintf(f, "; stale since %s\n", buf);
} else if (ANCIENT(rds)) {
fprintf(f, "; expired (awaiting cleanup)\n");
}
lib/dns/rbtdb.c
+1
View File
@@ -3180,6 +3180,7 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rdatasetheader_t *header,
rdataset->attributes |= DNS_RDATASETATTR_STALE_WINDOW;
}
rdataset->attributes |= DNS_RDATASETATTR_STALE;
rdataset->expire = header->rdh_ttl;
} else if (IS_CACHE(rbtdb) && !ACTIVE(header, now)) {
rdataset->attributes |= DNS_RDATASETATTR_ANCIENT;
rdataset->ttl = 0;