upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-23 02:43:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2147-obsolete-the-glue-cache-option' into 'main'

Browse source 
Obsolete the "glue-cache" option

Closes #2147

See merge request isc-projects/bind9!6500
This commit is contained in:
Michał Kępień 2022-06-30 13:27:54 +00:00
commit 692fb3eedd
15 changed files with 9 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5912. [cleanup] The "glue-cache" option has been removed. The glue cache
feature still works and is now permanently enabled.
[GL #2147]
5911. [bug] Update HTTP listener settings on reconfiguration.
[GL #3415]

1
bin/named/config.c
View file

@ -162,7 +162,6 @@ options {\n\
fetch-quota-params 100 0.1 0.3 0.7;\n\
fetches-per-server 0;\n\
fetches-per-zone 0;\n\
glue-cache yes;\n\
lame-ttl 0;\n"
#ifdef HAVE_LMDB
" lmdb-mapsize 32M;\n"

2
bin/named/named.conf.rst
View file

@ -276,7 +276,6 @@ OPTIONS
fstrm-set-output-queue-size integer;
fstrm-set-reopen-interval duration;
geoip-directory ( quoted_string | none );
glue-cache boolean;// deprecated
heartbeat-interval integer;
hostname ( quoted_string | none );
http-listener-clients integer;
@ -693,7 +692,6 @@ VIEW
forward ( first | only );
forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
| ipv6_address ) [ port integer ] [ dscp integer ]; ... };
glue-cache boolean;// deprecated
ipv4only-contact string;
ipv4only-enable boolean;
ipv4only-server string;

6
bin/named/server.c
View file

@ -5187,12 +5187,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
INSIST(result == ISC_R_SUCCESS);
view->auth_nxdomain = cfg_obj_asboolean(obj);
/* deprecated */
obj = NULL;
result = named_config_get(maps, "glue-cache", &obj);
INSIST(result == ISC_R_SUCCESS);
view->use_glue_cache = cfg_obj_asboolean(obj);
obj = NULL;
result = named_config_get(maps, "minimal-any", &obj);
INSIST(result == ISC_R_SUCCESS);

16
bin/tests/system/checkconf/bad-glue-cache-bogus.conf
View file

@ -1,16 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
options {
glue-cache bogusvalue;
};

16
bin/tests/system/checkconf/good-glue-cache.conf
View file

@ -1,16 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* SPDX-License-Identifier: MPL-2.0
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
options {
glue-cache yes;
};

14
doc/arm/reference.rst
View file

@ -2030,20 +2030,6 @@ Boolean Options
The default is ``no-auth-recursive``.
.. namedconf:statement:: glue-cache
When set to ``yes``, a cache is used to improve query performance
when adding address-type (A and AAAA) glue records to the additional
section of DNS response messages that delegate to a child zone.
The glue cache uses memory proportional to the number of delegations
in the zone. The default setting is ``yes``, which improves
performance at the cost of increased memory usage for the zone. To avoid
this, set it to ``no``.
.. note:: This option is deprecated and its use is discouraged. The
glue cache will be permanently *enabled* in a future release.
.. namedconf:statement:: minimal-any
If set to ``yes``, the server replies with only one of

2
doc/man/named.conf.5in
View file

@ -326,7 +326,6 @@ options {
fstrm\-set\-output\-queue\-size integer;
fstrm\-set\-reopen\-interval duration;
geoip\-directory ( quoted_string | none );
glue\-cache boolean;// deprecated
heartbeat\-interval integer;
hostname ( quoted_string | none );
http\-listener\-clients integer;
@ -779,7 +778,6 @@ view string [ class ] {
forward ( first | only );
forwarders [ port integer ] [ dscp integer ] { ( ipv4_address
| ipv6_address ) [ port integer ] [ dscp integer ]; ... };
glue\-cache boolean;// deprecated
ipv4only\-contact string;
ipv4only\-enable boolean;
ipv4only\-server string;

2
doc/misc/options
View file

@ -192,7 +192,6 @@ options {
fstrm-set-output-queue-size <integer>;
fstrm-set-reopen-interval <duration>;
geoip-directory ( <quoted_string> | none );
glue-cache <boolean>; // deprecated
heartbeat-interval <integer>;
hostname ( <quoted_string> | none );
http-listener-clients <integer>;
@ -565,7 +564,6 @@ view <string> [ <class> ] {
forward ( first | only );
forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
| <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
glue-cache <boolean>; // deprecated
ipv4only-contact <string>;
ipv4only-enable <boolean>;
ipv4only-server <string>;

2
doc/misc/options.active
View file

@ -191,7 +191,6 @@ options {
fstrm-set-output-queue-size <integer>;
fstrm-set-reopen-interval <duration>;
geoip-directory ( <quoted_string> | none );
glue-cache <boolean>; // deprecated
heartbeat-interval <integer>;
hostname ( <quoted_string> | none );
http-listener-clients <integer>;
@ -561,7 +560,6 @@ view <string> [ <class> ] {
forward ( first | only );
forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
| <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
glue-cache <boolean>; // deprecated
ipv4only-contact <string>;
ipv4only-enable <boolean>;
ipv4only-server <string>;

1
doc/misc/options.grammar.rst
View file

@ -128,7 +128,6 @@
fstrm-set-output-queue-size <integer>;
fstrm-set-reopen-interval <duration>;
geoip-directory ( <quoted_string> | none );
glue-cache <boolean>; // deprecated
heartbeat-interval <integer>;
hostname ( <quoted_string> | none );
http-listener-clients <integer>;

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

@ -30,7 +30,8 @@ New Features
Removed Features
~~~~~~~~~~~~~~~~
- None.
- The ``glue-cache`` *option* has been removed. The glue cache *feature*
still works and is now permanently *enabled*. :gl:`#2147`
Feature Changes
~~~~~~~~~~~~~~~

1
lib/dns/include/dns/view.h
View file

@ -117,7 +117,6 @@ struct dns_view {
bool qminimization;
bool qmin_strict;
bool auth_nxdomain;
bool use_glue_cache;
bool minimal_any;
dns_minimaltype_t minimalresponses;
bool enablevalidation;

2
lib/isccfg/namedconf.c
View file

@ -2080,7 +2080,7 @@ static cfg_clausedef_t view_clauses[] = {
{ "filter-aaaa", &cfg_type_bracketed_aml, CFG_CLAUSEFLAG_ANCIENT },
{ "filter-aaaa-on-v4", &cfg_type_boolean, CFG_CLAUSEFLAG_ANCIENT },
{ "filter-aaaa-on-v6", &cfg_type_boolean, CFG_CLAUSEFLAG_ANCIENT },
{ "glue-cache", &cfg_type_boolean, CFG_CLAUSEFLAG_DEPRECATED },
{ "glue-cache", &cfg_type_boolean, CFG_CLAUSEFLAG_ANCIENT },
{ "ipv4only-enable", &cfg_type_boolean, 0 },
{ "ipv4only-contact", &cfg_type_astring, 0 },
{ "ipv4only-server", &cfg_type_astring, 0 },

6
lib/ns/query.c
View file

@ -2099,10 +2099,8 @@ query_additional(query_ctx_t *qctx, dns_name_t *name,
/*
* Try to process glue directly.
*/
if (qctx->view->use_glue_cache &&
(rdataset->type == dns_rdatatype_ns) &&
(client->query.gluedb != NULL) &&
dns_db_iszone(client->query.gluedb))
if (rdataset->type == dns_rdatatype_ns &&
client->query.gluedb != NULL && dns_db_iszone(client->query.gluedb))
{
ns_dbversion_t *dbversion;