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

remove resolver-retry-interval and resolver-nonbackoff-tries

Browse source 
fully remove these options and mark them as ancient.
This commit is contained in:
Evan Hunt 2023-10-31 15:13:30 +01:00
parent 4aaa4f7dca
commit 66496d550b
11 changed files with 6 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,6 +1,6 @@
6296. [func] The "resolver-nonbackoff-tries" and
"resolver-retry-interval" options are deprecated;
a warning will be logged if they are used. [GL #4405]
"resolver-retry-interval" options have been removed;
Using them is now a fatal error. [GL #4405]
6295. [bug] Fix an assertion failure which could occur during
shutdown when DNSSEC validation was running. [GL #4462]

2
bin/named/config.c
View file

@ -189,8 +189,6 @@ options {\n\
request-expire true;\n\
request-ixfr true;\n\
require-server-cookie no;\n\
resolver-nonbackoff-tries 3;\n\
resolver-retry-interval 800; /* in milliseconds */\n\
root-key-sentinel yes;\n\
servfail-ttl 1;\n\
# sortlist <none>\n\

18
bin/named/server.c
View file

@ -4034,7 +4034,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
unsigned int query_timeout;
bool old_rpz_ok = false;
dns_dyndbctx_t *dctx = NULL;
unsigned int resolver_param;
dns_ntatable_t *ntatable = NULL;
const char *qminmode = NULL;
dns_adb_t *adb = NULL;
@ -4888,23 +4887,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
}
view->maxbits = maxbits;
/*
* Set resolver retry parameters.
*/
obj = NULL;
CHECK(named_config_get(maps, "resolver-retry-interval", &obj));
resolver_param = cfg_obj_asuint32(obj);
if (resolver_param > 0) {
dns_resolver_setretryinterval(view->resolver, resolver_param);
}
obj = NULL;
CHECK(named_config_get(maps, "resolver-nonbackoff-tries", &obj));
resolver_param = cfg_obj_asuint32(obj);
if (resolver_param > 0) {
dns_resolver_setnonbackofftries(view->resolver, resolver_param);
}
/*
* Set supported DNSSEC algorithms.
*/

3
bin/tests/system/checkconf/deprecated.conf
View file

@ -27,9 +27,6 @@ options {
avoid-v4-udp-ports { range 1 1023; };
avoid-v6-udp-ports { range 1 1023; };
resolver-nonbackoff-tries 3;
resolver-retry-interval 800;
dnssec-must-be-secure mustbesecure.example yes;
};

2
bin/tests/system/checkconf/tests.sh
View file

@ -174,8 +174,6 @@ grep "option 'avoid-v4-udp-ports' is deprecated" <checkconf.out$n.1 >/dev/null |
grep "option 'avoid-v6-udp-ports' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
grep "option 'dialup' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
grep "option 'heartbeat-interval' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
grep "option 'resolver-nonbackoff-tries' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
grep "option 'resolver-retry-interval' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
grep "option 'dnssec-must-be-secure' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
grep "token 'port' is deprecated" <checkconf.out$n.1 >/dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi

17
doc/arm/reference.rst
View file

@ -4229,23 +4229,6 @@ Tuning
When :any:`stale-cache-enable` is set to ``no``, setting the :any:`max-stale-ttl`
has no effect, the value of :any:`max-cache-ttl` will be ``0`` in such case.
.. namedconf:statement:: resolver-nonbackoff-tries
:tags: deprecated.
:short: Specifies the number of retries before exponential backoff.
This specifies how many retries occur before exponential backoff kicks in.
The default is ``3``.
This option is deprecated and will be removed in a future release.
.. namedconf:statement:: resolver-retry-interval
:tags: deprecated
:short: Sets the base retry interval (in milliseconds).
This sets the base retry interval in milliseconds. The default is ``800``.
This option is deprecated and will be removed in a future release.
.. namedconf:statement:: sig-validity-interval
:tags: obsolete

4
doc/misc/options
View file

@ -247,9 +247,7 @@ options {
request-ixfr <boolean>;
request-nsid <boolean>;
require-server-cookie <boolean>;
resolver-nonbackoff-tries <integer>; // deprecated
resolver-query-timeout <integer>;
resolver-retry-interval <integer>; // deprecated
resolver-use-dns64 <boolean>;
response-padding { <address_match_element>; ... } block-size <integer>;
response-policy { zone <string> [ add-soa <boolean> ] [ log <boolean> ] [ max-policy-ttl <duration> ] [ min-update-interval <duration> ] [ policy ( cname | disabled | drop | given | no-op | nodata | nxdomain | passthru | tcp-only <quoted_string> ) ] [ recursive-only <boolean> ] [ nsip-enable <boolean> ] [ nsdname-enable <boolean> ] [ ede <string> ]; ... } [ add-soa <boolean> ] [ break-dnssec <boolean> ] [ max-policy-ttl <duration> ] [ min-update-interval <duration> ] [ min-ns-dots <integer> ] [ nsip-wait-recurse <boolean> ] [ nsdname-wait-recurse <boolean> ] [ qname-wait-recurse <boolean> ] [ recursive-only <boolean> ] [ nsip-enable <boolean> ] [ nsdname-enable <boolean> ] [ dnsrps-enable <boolean> ] [ dnsrps-options { <unspecified-text> } ];
@ -523,9 +521,7 @@ view <string> [ <class> ] {
request-ixfr <boolean>;
request-nsid <boolean>;
require-server-cookie <boolean>;
resolver-nonbackoff-tries <integer>; // deprecated
resolver-query-timeout <integer>;
resolver-retry-interval <integer>; // deprecated
resolver-use-dns64 <boolean>;
response-padding { <address_match_element>; ... } block-size <integer>;
response-policy { zone <string> [ add-soa <boolean> ] [ log <boolean> ] [ max-policy-ttl <duration> ] [ min-update-interval <duration> ] [ policy ( cname | disabled | drop | given | no-op | nodata | nxdomain | passthru | tcp-only <quoted_string> ) ] [ recursive-only <boolean> ] [ nsip-enable <boolean> ] [ nsdname-enable <boolean> ] [ ede <string> ]; ... } [ add-soa <boolean> ] [ break-dnssec <boolean> ] [ max-policy-ttl <duration> ] [ min-update-interval <duration> ] [ min-ns-dots <integer> ] [ nsip-wait-recurse <boolean> ] [ nsdname-wait-recurse <boolean> ] [ qname-wait-recurse <boolean> ] [ recursive-only <boolean> ] [ nsip-enable <boolean> ] [ nsdname-enable <boolean> ] [ dnsrps-enable <boolean> ] [ dnsrps-options { <unspecified-text> } ];

2
doc/notes/notes-current.rst
View file

@ -36,7 +36,7 @@ Removed Features
:gl:`#4421`
- The ``resolver-nonbackoff-tries`` and ``resolver-retry-interval`` options
are now deprecated. A warning will be logged if they are used. :gl:`#4405`
have been removed. Using them is now a fatal error. :gl:`#4405`
Feature Changes
~~~~~~~~~~~~~~~

33
lib/dns/include/dns/resolver.h
View file

@ -517,39 +517,6 @@ dns_resolver_getzeronosoattl(dns_resolver_t *resolver);
void
dns_resolver_setzeronosoattl(dns_resolver_t *resolver, bool state);
unsigned int
dns_resolver_getretryinterval(dns_resolver_t *resolver);
void
dns_resolver_setretryinterval(dns_resolver_t *resolver, unsigned int interval);
/*%<
* Sets the amount of time, in milliseconds, that is waited for a reply
* to a server before another server is tried. Interacts with the
* value of dns_resolver_getnonbackofftries() by trying that number of times
* at this interval, before doing exponential backoff and doubling the interval
* on each subsequent try, to a maximum of 10 seconds. Defaults to 800 ms;
* silently capped at 2000 ms.
*
* Requires:
* \li resolver to be valid.
* \li interval > 0.
*/
unsigned int
dns_resolver_getnonbackofftries(dns_resolver_t *resolver);
void
dns_resolver_setnonbackofftries(dns_resolver_t *resolver, unsigned int tries);
/*%<
* Sets the number of failures of getting a reply from remote servers for
* a query before backing off by doubling the retry interval for each
* subsequent request sent. Defaults to 3.
*
* Requires:
* \li resolver to be valid.
* \li tries > 0.
*/
unsigned int
dns_resolver_getoptions(dns_resolver_t *resolver);
/*%<

32
lib/dns/resolver.c
View file

@ -9953,7 +9953,7 @@ dns_resolver_create(dns_view_t *view, isc_loopmgr_t *loopmgr, isc_nm_t *nm,
.spillatmin = 10,
.spillat = 10,
.spillatmax = 100,
.retryinterval = 10000,
.retryinterval = 800,
.nonbackofftries = 3,
.query_timeout = DEFAULT_QUERY_TIMEOUT,
.maxdepth = DEFAULT_RECURSION_DEPTH,
@ -11052,36 +11052,6 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which) {
return (resolver->quotaresp[which]);
}
unsigned int
dns_resolver_getretryinterval(dns_resolver_t *resolver) {
REQUIRE(VALID_RESOLVER(resolver));
return (resolver->retryinterval);
}
void
dns_resolver_setretryinterval(dns_resolver_t *resolver, unsigned int interval) {
REQUIRE(VALID_RESOLVER(resolver));
REQUIRE(interval > 0);
resolver->retryinterval = ISC_MIN(interval, 2000);
}
unsigned int
dns_resolver_getnonbackofftries(dns_resolver_t *resolver) {
REQUIRE(VALID_RESOLVER(resolver));
return (resolver->nonbackofftries);
}
void
dns_resolver_setnonbackofftries(dns_resolver_t *resolver, unsigned int tries) {
REQUIRE(VALID_RESOLVER(resolver));
REQUIRE(tries > 0);
resolver->nonbackofftries = tries;
}
void
dns_resolver_setstats(dns_resolver_t *res, isc_stats_t *stats) {
REQUIRE(VALID_RESOLVER(res));

5
lib/isccfg/namedconf.c
View file

@ -2134,10 +2134,9 @@ static cfg_clausedef_t view_clauses[] = {
{ "request-sit", NULL, CFG_CLAUSEFLAG_ANCIENT },
{ "require-server-cookie", &cfg_type_boolean, 0 },
{ "resolver-nonbackoff-tries", &cfg_type_uint32,
CFG_CLAUSEFLAG_DEPRECATED },
CFG_CLAUSEFLAG_ANCIENT },
{ "resolver-query-timeout", &cfg_type_uint32, 0 },
{ "resolver-retry-interval", &cfg_type_uint32,
CFG_CLAUSEFLAG_DEPRECATED },
{ "resolver-retry-interval", &cfg_type_uint32, CFG_CLAUSEFLAG_ANCIENT },
{ "response-padding", &cfg_type_resppadding, 0 },
{ "response-policy", &cfg_type_rpz, 0 },
{ "rfc2308-type1", NULL, CFG_CLAUSEFLAG_ANCIENT },