upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-13 19:40:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1795-make-dnstap-work-reliably-with-netmgr' into 'master'

Browse source 
Make dnstap work reliably with netmgr

Closes #1795

See merge request isc-projects/bind9!3431
This commit is contained in:
Ondřej Surý 2020-05-01 13:18:32 +00:00
commit 5110dfd8d7
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,8 @@
5399. [func] Add engine support to OpenSSL EdDSA implementation.
5401. [bug] The number of input queues allocated during dnstap
initialization was too low, which could prevent some
dnstap data from being logged. [GL #1795]
5400. [func] Add engine support to OpenSSL EdDSA implementation.
[GL #1763]
5399. [func] Add engine support to OpenSSL ECDSA implementation.

6
bin/named/server.c
View file

@ -3677,7 +3677,11 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) {
}
fopt = fstrm_iothr_options_init();
fstrm_iothr_options_set_num_input_queues(fopt, named_g_cpus);
/*
* Both network threads and worker threads may log dnstap data.
*/
fstrm_iothr_options_set_num_input_queues(fopt,
2 * named_g_cpus);
fstrm_iothr_options_set_queue_model(
fopt, FSTRM_IOTHR_QUEUE_MODEL_MPSC);

2
bin/tests/system/dnstap/ns3/named.args Normal file
View file

@ -0,0 +1,2 @@
# Using "-n 1" allows GL #1795 to be reliably reproduced
-D dnstap-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4 -n 1

3
doc/arm/notes-9.17.2.xml
View file

@ -15,7 +15,8 @@
<itemizedlist>
<listitem>
<para>
None.
A bug in dnstap initialization could prevent some dnstap data from
being logged, especially on recursive resolvers. [GL #1795]
</para>
</listitem>
</itemizedlist>

1
util/copyrights
View file

@ -413,6 +413,7 @@
./bin/tests/system/dnstap/README TXT.BRIEF 2019,2020
./bin/tests/system/dnstap/clean.sh SH 2015,2016,2017,2018,2019,2020
./bin/tests/system/dnstap/large-answer.fstrm X 2019,2020
./bin/tests/system/dnstap/ns3/named.args X 2020
./bin/tests/system/dnstap/setup.sh SH 2018,2019,2020
./bin/tests/system/dnstap/tests.sh SH 2015,2016,2017,2018,2019,2020
./bin/tests/system/dnstap/ydump.py PYTHON 2016,2017,2018,2019,2020