From: Evan Hunt Date: Tue, 31 Oct 2023 14:13:30 +0000 (+0100) Subject: remove resolver-retry-interval and resolver-nonbackoff-tries X-Git-Tag: v9.19.19~6^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66496d550bbd391871d20f3fb6dc188b06eed2a2;p=thirdparty%2Fbind9.git remove resolver-retry-interval and resolver-nonbackoff-tries fully remove these options and mark them as ancient. --- diff --git a/CHANGES b/CHANGES index b8a4b544cf3..3c521e9cb93 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/bin/named/config.c b/bin/named/config.c index 57932107a67..b1d6c04b3fb 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -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 \n\ diff --git a/bin/named/server.c b/bin/named/server.c index a8d39608b68..80c5b5f1bb8 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -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. */ diff --git a/bin/tests/system/checkconf/deprecated.conf b/bin/tests/system/checkconf/deprecated.conf index abdcd6339ef..15d719d6a44 100644 --- a/bin/tests/system/checkconf/deprecated.conf +++ b/bin/tests/system/checkconf/deprecated.conf @@ -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; }; diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh index d0176b6a1ed..7eced176630 100644 --- a/bin/tests/system/checkconf/tests.sh +++ b/bin/tests/system/checkconf/tests.sh @@ -174,8 +174,6 @@ grep "option 'avoid-v4-udp-ports' is deprecated" /dev/null | grep "option 'avoid-v6-udp-ports' is deprecated" /dev/null || ret=1 grep "option 'dialup' is deprecated" /dev/null || ret=1 grep "option 'heartbeat-interval' is deprecated" /dev/null || ret=1 -grep "option 'resolver-nonbackoff-tries' is deprecated" /dev/null || ret=1 -grep "option 'resolver-retry-interval' is deprecated" /dev/null || ret=1 grep "option 'dnssec-must-be-secure' is deprecated" /dev/null || ret=1 grep "token 'port' is deprecated" /dev/null || ret=1 if [ $ret -ne 0 ]; then echo_i "failed"; fi diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index 1f0d253bd8a..8468a785eaf 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -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 diff --git a/doc/misc/options b/doc/misc/options index b61f6b8ed22..297822121af 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -247,9 +247,7 @@ options { request-ixfr ; request-nsid ; require-server-cookie ; - resolver-nonbackoff-tries ; // deprecated resolver-query-timeout ; - resolver-retry-interval ; // deprecated resolver-use-dns64 ; response-padding { ; ... } block-size ; response-policy { zone [ add-soa ] [ log ] [ max-policy-ttl ] [ min-update-interval ] [ policy ( cname | disabled | drop | given | no-op | nodata | nxdomain | passthru | tcp-only ) ] [ recursive-only ] [ nsip-enable ] [ nsdname-enable ] [ ede ]; ... } [ add-soa ] [ break-dnssec ] [ max-policy-ttl ] [ min-update-interval ] [ min-ns-dots ] [ nsip-wait-recurse ] [ nsdname-wait-recurse ] [ qname-wait-recurse ] [ recursive-only ] [ nsip-enable ] [ nsdname-enable ] [ dnsrps-enable ] [ dnsrps-options { } ]; @@ -523,9 +521,7 @@ view [ ] { request-ixfr ; request-nsid ; require-server-cookie ; - resolver-nonbackoff-tries ; // deprecated resolver-query-timeout ; - resolver-retry-interval ; // deprecated resolver-use-dns64 ; response-padding { ; ... } block-size ; response-policy { zone [ add-soa ] [ log ] [ max-policy-ttl ] [ min-update-interval ] [ policy ( cname | disabled | drop | given | no-op | nodata | nxdomain | passthru | tcp-only ) ] [ recursive-only ] [ nsip-enable ] [ nsdname-enable ] [ ede ]; ... } [ add-soa ] [ break-dnssec ] [ max-policy-ttl ] [ min-update-interval ] [ min-ns-dots ] [ nsip-wait-recurse ] [ nsdname-wait-recurse ] [ qname-wait-recurse ] [ recursive-only ] [ nsip-enable ] [ nsdname-enable ] [ dnsrps-enable ] [ dnsrps-options { } ]; diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index 70507cef599..593a3932218 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -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 ~~~~~~~~~~~~~~~ diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index 66ab0888ec5..e9258827e47 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -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); /*%< diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 781237ad674..f0f48d990df 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -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)); diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index fcd86dffce7..002d4d43a14 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -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 },