deprecate resolver-retry-interval and resolver-nonbackoff-tries

these options control default timing of retries in the resolver
for experimental purposes; they are not known to useful in production
environments.  they will be removed in the future; for now, we
only log a warning if they are used.

(cherry picked from commit 4aaa4f7dca7fee5e62e4554bfbe5ea92f6a4ac6e)

diff --git a/CHANGES b/CHANGES
index 543eeafa2301634d4b6d9cde114f71e77aa125aa..011eedc8f7f43678d763f546e831373e446d11bf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6296.  [func]          The "resolver-nonbackoff-tries" and
+                       "resolver-retry-interval" options are deprecated;
+                       a warning will be logged if they are used. [GL #4405]
+
 6294.  [bug]           BIND might sometimes crash after startup or
                        re-configuration when one 'tls' entry is used multiple
                        times to connect to remote servers due to initialisation

diff --git a/bin/tests/system/checkconf/deprecated.conf b/bin/tests/system/checkconf/deprecated.conf
index bd6e0c2f1c10ff3570bc973a0294fe9fa2fdb2ba..d66dfa88d08ee05c28492cdd90718acdc3c258b2 100644 (file)
--- a/bin/tests/system/checkconf/deprecated.conf
+++ b/bin/tests/system/checkconf/deprecated.conf
@@ -31,6 +31,9 @@ options {
        tkey-dhkey "server" 12345;
 
        root-delegation-only exclude { "them"; };
+
+       resolver-nonbackoff-tries 3;
+       resolver-retry-interval 800;
 };
 
 trusted-keys {

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index 9fd5248257d443a4e72e5fe4ad44d903c09f89c7..dc7854b2911a47d7d1bb2eee15243dee0c7a25de 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -192,6 +192,8 @@ grep "option 'root-delegation-only' is deprecated" <checkconf.out$n.1 >/dev/null
 grep "'type delegation-only' 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 a40046e7013e131df03870cd1e805c74b4c4f0e5..e1b8228fa98e4c809b51f52891768b489734ac95 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -4370,18 +4370,22 @@ Tuning
    has no effect, the value of :any:`max-cache-ttl` will be ``0`` in such case.
 
 .. namedconf:statement:: resolver-nonbackoff-tries
-   :tags: server
+   :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 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: server, query
+   :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: dnssec
    :short: Specifies the maximum number of days that RRSIGs generated by :iscman:`named` are valid.

diff --git a/doc/misc/options b/doc/misc/options
index e19261f1120658933dc8a0617d495296ea8053fc..a91670154c8ca377515b5504a3717f9e3e9e650b 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -252,9 +252,9 @@ options {
        request-nsid <boolean>;
        require-server-cookie <boolean>;
        reserved-sockets <integer>; // deprecated
-       resolver-nonbackoff-tries <integer>;
+       resolver-nonbackoff-tries <integer>; // deprecated
        resolver-query-timeout <integer>;
-       resolver-retry-interval <integer>;
+       resolver-retry-interval <integer>; // deprecated
        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> ]; ... } [ 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> } ];
        reuseport <boolean>;
@@ -532,9 +532,9 @@ view <string> [ <class> ] {
        request-ixfr <boolean>;
        request-nsid <boolean>;
        require-server-cookie <boolean>;
-       resolver-nonbackoff-tries <integer>;
+       resolver-nonbackoff-tries <integer>; // deprecated
        resolver-query-timeout <integer>;
-       resolver-retry-interval <integer>;
+       resolver-retry-interval <integer>; // deprecated
        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> ]; ... } [ 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> } ];
        root-delegation-only [ exclude { <string>; ... } ]; // deprecated

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 615f5187bc07ab82f37a1fb28fbae43b092a9a45..05cc5e90fef48fb5dce6f2bae18fdff575f63210 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -28,6 +28,9 @@ Removed Features
 - The support for AES algorithm for DNS cookies has been deprecated.
   :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`
+
 Feature Changes
 ~~~~~~~~~~~~~~~
 

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 4e4c09807308dca3e51252eeefc723a8f615ae90..5a8ccb2c34045d640441acbaa5a7e882ac624d7e 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2137,9 +2137,11 @@ static cfg_clausedef_t view_clauses[] = {
        { "request-nsid", &cfg_type_boolean, 0 },
        { "request-sit", NULL, CFG_CLAUSEFLAG_ANCIENT },
        { "require-server-cookie", &cfg_type_boolean, 0 },
-       { "resolver-nonbackoff-tries", &cfg_type_uint32, 0 },
+       { "resolver-nonbackoff-tries", &cfg_type_uint32,
+         CFG_CLAUSEFLAG_DEPRECATED },
        { "resolver-query-timeout", &cfg_type_uint32, 0 },
-       { "resolver-retry-interval", &cfg_type_uint32, 0 },
+       { "resolver-retry-interval", &cfg_type_uint32,
+         CFG_CLAUSEFLAG_DEPRECATED },
        { "response-padding", &cfg_type_resppadding, 0 },
        { "response-policy", &cfg_type_rpz, 0 },
        { "rfc2308-type1", NULL, CFG_CLAUSEFLAG_ANCIENT },