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

fully remove these options and mark them as ancient.

diff --git a/CHANGES b/CHANGES
index b8a4b544cf3202d668b7c02f3211fa9302109897..3c521e9cb93113196042e5b32d6351bc231c7300 100644 (file)
--- 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 57932107a6716b48500375ed7b9bd7b4dcfaad1c..b1d6c04b3fbc53cb68f695de301a5b81e4a4cac6 100644 (file)
--- 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 <none>\n\

diff --git a/bin/named/server.c b/bin/named/server.c
index a8d39608b680dffe4268d078bfbbf63c0a0acf3c..80c5b5f1bb8a99c019b7d442d488f0f8dab774cb 100644 (file)
--- 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 abdcd6339ef6d38bdddc1f98d66a5020a1aa3ca7..15d719d6a449d75ec55ad6701c2fc49519d3534e 100644 (file)
--- 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 d0176b6a1ed97dd3a564945fab138b843ea73b69..7eced1766301b09bca9538a2ca29d0fa497a20a6 100644 (file)
--- 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" <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

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 1f0d253bd8a92dc5d607f56f1b85b0ee8f79fbb3..8468a785eaf5c84bff30b90cffb660fe7825a1c9 100644 (file)
--- 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 b61f6b8ed22f9bd2e089a08cb82d5179be0f5208..297822121af68dc176ae324405359ab9964e9cef 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -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> } ];

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 70507cef5992fcaf57858a4bb6b6bdb098458c20..593a393221825d7e34974b10a2b8eed1537572cb 100644 (file)
--- 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 66ab0888ec510343c22476b77370713a3091d339..e9258827e474df0762a7958d46770588b569391b 100644 (file)
--- 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 781237ad674da53e35716a77383b630c1e4d40fb..f0f48d990df45c45912de8246dfe7123bb568c0d 100644 (file)
--- 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 fcd86dffce73bd4519b8713fa3b94cc8fe75876f..002d4d43a143cddf72f540dd32f405c5fd2cd04d 100644 (file)
--- 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 },