ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

4447. [tuning] Allow the fstrm_iothr_init() options to be set using

Browse Source 
named.conf to control how dnstap manages the data
                        flow. [RT #42974]

(cherry picked from commit 934837913f)
This commit is contained in:
Mark Andrews
2016-08-18 11:16:06 +10:00
parent a0c1ad17ab
commit 7204d08a31
33 changed files with 709 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-buffer-hint 65537;
};

11
bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-buffer-hint 1023;
};

11
bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-flush-timeout 0;
};

11
bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-min.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-flush-timeout 601;
};

11
bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-max.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-input-queue-size 1;
};

11
bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-min.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-input-queue-size 16385;
};

11
bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-po2.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-input-queue-size 513;
};

11
bin/tests/system/dnstap/bad-fstrm-set-output-notify-threshold.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-output-notify-threshold 0;
};

14
bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-max.conf Normal file
View File

@@ -0,0 +1,14 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
/*
* This value is system dependent and matches IOV_MAX.
*/
fstrm-set-output-queue-size 10000000;
};

11
bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-output-queue-size 1;
};

11
bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-reopen-interval 601;
};

11
bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-reopen-interval 0;
};

11
bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-buffer-hint 8192;
};

11
bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-flush-timeout 1;
};

11
bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-input-queue-size 512;
};

11
bin/tests/system/dnstap/good-fstrm-set-output-notify-threshold.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-output-notify-threshold 32;
};

11
bin/tests/system/dnstap/good-fstrm-set-output-queue-model-mpsc.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-output-queue-model mpsc;
};

11
bin/tests/system/dnstap/good-fstrm-set-output-queue-model-spsc.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-output-queue-model spsc;
};

11
bin/tests/system/dnstap/good-fstrm-set-output-queue-size.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-output-queue-size 64;
};

11
bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf Normal file
View File

@@ -0,0 +1,11 @@
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
* 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 http://mozilla.org/MPL/2.0/.
*/
options {
fstrm-set-reopen-interval 5;
};

18
bin/tests/system/dnstap/tests.sh
View File

@@ -13,6 +13,24 @@ RNDCCMD="$RNDC -p 9953 -c ../common/rndc.conf"
status=0
for bad in bad-*.conf
do
ret=0
echo "I: checking that named-checkconf detects error in $bad"
$CHECKCONF $bad > /dev/null 2>&1
if [ $? != 1 ]; then echo "I:failed"; ret=1; fi
status=`expr $status + $ret`
done
for good in good-*.conf
do
ret=0
echo "I: checking that named-checkconf detects no error in $good"
$CHECKCONF $good > /dev/null 2>&1
if [ $? != 0 ]; then echo "I:failed"; ret=1; fi
status=`expr $status + $ret`
done
$DIG +short @10.53.0.3 -p 5300 a.example > dig.out
# check three different dnstap reopen/roll methods: