Restart zone maintenance if it had been stalled.

(cherry picked from commit f171347b5f27c1b0dfe1ef935512b20a820901c9)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 88f56eb48119d0336dc963198664d73f14b5d890..9bca77a03cf18f711a880ff3294afda7896fe278 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -5128,6 +5128,14 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
            DNS_ZONE_FLAG(zone->secure, DNS_ZONEFLG_LOADED))
        {
                DNS_ZONE_CLRFLAG(zone->secure, DNS_ZONEFLG_LOADPENDING);
+               /*
+                * Re-start zone maintenance if it had been stalled
+                * due to DNS_ZONEFLG_LOADPENDING being set when
+                * zone_maintenance was called.
+                */
+               if (zone->secure->task != NULL) {
+                       zone_settimer(zone->secure, &now);
+               }
        }
 
        zone_debuglog(zone, "zone_postload", 99, "done");