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

Merge branch '2791-busy-wait-setnsec3param-shutdown-hang' into 'main'

Browse source 
Fix setnsec3param shutdown hang

Closes #2791

See merge request isc-projects/bind9!5219
This commit is contained in:
Matthijs Mekking 2021-06-28 09:01:02 +00:00
commit 6f84024cb5
7 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5668. [bug] When a zone fails to load on startup, the setnsec3param
task is rescheduled. This caused a hang on shutdown, and
is now fixed. [GL #2791]
5667. [bug] The configuration-checking code failed to account for
the inheritance rules of the "dnssec-policy" option.
[GL #2780]

8
bin/tests/system/nsec3/ns3/named.conf.in
View file

@ -111,3 +111,11 @@ zone "nsec3-to-nsec.kasp" {
file "nsec3-to-nsec.kasp.db";
dnssec-policy "nsec3";
};
/* The zone fails to load, this should not prevent shutdown. */
zone "nsec3-fails-to-load.kasp" {
type primary;
file "nsec3-fails-to-load.kasp.db";
dnssec-policy "nsec3";
allow-update { any; };
};

8
bin/tests/system/nsec3/ns3/named2.conf.in
View file

@ -117,3 +117,11 @@ zone "nsec3-to-nsec.kasp" {
//dnssec-policy "nsec3";
dnssec-policy "nsec";
};
/* The zone fails to load, but is fixed after a reload. */
zone "nsec3-fails-to-load.kasp" {
type primary;
file "nsec3-fails-to-load.kasp.db";
dnssec-policy "nsec3";
allow-update { any; };
};

8
bin/tests/system/nsec3/ns3/nsec3-fails-to-load.kasp.db.in Normal file
View file

@ -0,0 +1,8 @@
@ IN SOA kasp. nsec3-fails-to-load.kasp. (
1 ; serial
30 ; refresh (30 seconds)
10 ; retry (10 seconds)
3600000 ; expire (5 weeks 6 days 16 hours)
300 ; minimum (5 minutes)
)
NS nsec3-fails-to-load.kasp.

2
bin/tests/system/nsec3/ns3/setup.sh
View file

@ -27,3 +27,5 @@ for zn in nsec-to-nsec3 nsec3 nsec3-other nsec3-change nsec3-to-nsec \
do
setup "${zn}.kasp"
done
cp nsec3-fails-to-load.kasp.db.in nsec3-fails-to-load.kasp.db

11
bin/tests/system/nsec3/tests.sh
View file

@ -218,7 +218,6 @@ echo_i "reconfig dnssec-policy to trigger nsec3 rollovers"
copy_setports ns3/named2.conf.in ns3/named.conf
rndc_reconfig ns3 10.53.0.3
# Zone: nsec-to-nsec3.kasp. (reconfigured)
set_zone_policy "nsec-to-nsec3.kasp" "nsec3"
set_nsec3param "0" "5" "8"
@ -324,5 +323,15 @@ echo_i "check zone ${ZONE} after restart has salt ${SALT}"
check_nsec3
dnssec_verify
# Zone: nsec3-fails-to-load.kasp. (should be fixed after reload)
cp ns3/template.db.in ns3/nsec3-fails-to-load.kasp.db
rndc_reload ns3 10.53.0.3
set_zone_policy "nsec3-fails-to-load.kasp" "nsec3"
set_nsec3param "0" "5" "8"
echo_i "check zone ${ZONE} after reload"
check_nsec3
dnssec_verify
echo_i "exit status: $status"
[ $status -eq 0 ] || exit 1

7
lib/dns/zone.c
View file

@ -21228,6 +21228,7 @@ static void
setnsec3param(isc_task_t *task, isc_event_t *event) {
const char *me = "setnsec3param";
dns_zone_t *zone = event->ev_arg;
bool loadpending;
INSIST(DNS_ZONE_VALID(zone));
@ -21235,6 +21236,10 @@ setnsec3param(isc_task_t *task, isc_event_t *event) {
ENTER;
LOCK_ZONE(zone);
loadpending = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING);
UNLOCK_ZONE(zone);
/*
* If receive_secure_serial is still processing or we have a
* queued event append rss_post queue.
@ -21252,7 +21257,7 @@ setnsec3param(isc_task_t *task, isc_event_t *event) {
* be picked up later. This turns this function into a busy
* wait, but it only happens at startup.
*/
if (zone->db == NULL) {
if (zone->db == NULL && loadpending) {
rescheduled = true;
isc_task_send(task, &event);
}