From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 29 Sep 2017 20:40:53 +0000 (+0200)
Subject: Improve dnsbulktest experience in travis for more robustness
X-Git-Tag: rec-4.1.0-rc1~13^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a27076c38e2d399204d41928374e1bb9c45969c;p=thirdparty%2Fpdns.git

Improve dnsbulktest experience in travis for more robustness

This commit changes our dnsbulktest source from Alexa to Cisco Umbrella, but this turned out not to be as important as we thought.
In addition, it turns out we had been installing pdns-tools incorrectly because of wrong apt-settings. We now install pdns-tools from the master repo at repo.powerdns.com
This commit also tunes pdns_recursor to use less simultaneous outbound connections during testing, which appears to make Travis NAT happier, leading to less errors.
Finally, we use new features of dnsbulktest to extract more statistics for how well we are doing. Success is now dependent on errors and timeouts, and less on NXDOMAIN.
---

diff --git a/build-scripts/test-recursor-bulk b/build-scripts/test-recursor-bulk
index 1f5863b66e..5448eb819d 100755
--- a/build-scripts/test-recursor-bulk
+++ b/build-scripts/test-recursor-bulk
@@ -12,7 +12,7 @@ set -x
 
 cd regression-tests
 
-wget -c -N https://s3.amazonaws.com/alexa-static/top-1m.csv.zip
+wget -c -N http://s3-us-west-1.amazonaws.com/umbrella-static/top-1m.csv.zip
 
 unzip top-1m.csv.zip
 
diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index a37c05a741..9a9f6b830c 100755
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -331,11 +331,11 @@ install_recursor() {
     moreutils \
     snmpd"
   run "cd .."
-  run "wget https://s3.amazonaws.com/alexa-static/top-1m.csv.zip"
+  run "wget http://s3-us-west-1.amazonaws.com/umbrella-static/top-1m.csv.zip"
   run "unzip top-1m.csv.zip -d ${TRAVIS_BUILD_DIR}/regression-tests"
-  run 'echo -e "deb [arch=amd64] http://repo.powerdns.com/ubuntu trusty-auth-40 main" | sudo tee /etc/apt/sources.list.d/pdns.list'
-  run 'echo -e "Package: pdns-*\nPin: origin PowerDNS\nPin-Priority: 600" | sudo tee /etc/apt/preferences.d/pdns.list'
-  run 'curl https://repo.powerdns.com/FD380FBB-pub.asc | sudo apt-key add - '
+  run 'echo -e "deb [arch=amd64] http://repo.powerdns.com/ubuntu trusty-auth-master main" | sudo tee /etc/apt/sources.list.d/pdns.list'
+  run 'echo -e "Package: pdns-*\nPin: origin repo.powerdns.com\nPin-Priority: 9001" | sudo tee /etc/apt/preferences.d/pdns'
+  run 'curl https://repo.powerdns.com/CBC8B383-pub.asc | sudo apt-key add - '
   run 'sudo apt-get update'
   run 'sudo apt-get -y install pdns-server pdns-tools'
   run "sudo service pdns stop"
@@ -544,7 +544,7 @@ test_recursor() {
   run "./build-scripts/test-recursor"
   export RECURSOR="${PDNSRECURSOR}"
   run "cd regression-tests"
-  run "THRESHOLD=90 TRACE=no ./timestamp ./recursor-test 5300 25000"
+  run "THRESHOLD=90 TRACE=no ./timestamp ./recursor-test 5300 50000"
   run "cd .."
 
   run "cd regression-tests.api"
diff --git a/regression-tests/recursor-test b/regression-tests/recursor-test
index aec804485e..e0cfddc18e 100755
--- a/regression-tests/recursor-test
+++ b/regression-tests/recursor-test
@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 port=$1
 [ -z "$port" ] && port=5300
 limit=$2
@@ -6,7 +6,7 @@ limit=$2
 
 : ${RECURSOR:="../pdns/recursordist/pdns_recursor"}
 : ${CSV:="top-1m.csv"}
-: ${IPv6:="1"}
+: ${IPv6:="0"}
 : ${TRACE:="fail"}
 : ${DNSBULKTEST:="../pdns/dnsbulktest"}
 
@@ -24,9 +24,9 @@ rm -f recursor.pid pdns_recursor.pid
 <measurement><name>system CPU seconds</name><value>%S</value></measurement>
 <measurement><name>wallclock seconds</name><value>%e</value></measurement>
 <measurement><name>%% CPU used</name><value>%P</value></measurement>
-'         ${RECURSOR} --daemon=no --local-port=$port --socket-dir=./ --trace=$TRACE --config-dir=. --query-local-address6="${QLA6}" > recursor.log 2>&1 &
+'         ${RECURSOR} --daemon=no --local-port=$port --socket-dir=./ --trace=$TRACE --config-dir=. --max-mthreads=100 --query-local-address6="${QLA6}" > recursor.log 2>&1 &
 sleep 3
-${DNSBULKTEST} -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.results
+${DNSBULKTEST} --www=false -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.results
 kill $(cat pdns_recursor.pid)
 sleep 5
 
@@ -36,7 +36,10 @@ mkdir -p recursor-bulktest
 rm -f failed_tests passed_tests
 touch failed_tests passed_tests
 : ${THRESHOLD:="95"}
-if [ "$DBT_OKPERCENTAGEINT" -ge $THRESHOLD ]
+
+ANANSWER=$[(100*(${DBT_QUEUED}-${DBT_ERRORS}-${DBT_TIMEOUTS}) )/${DBT_QUEUED}]
+
+if [ "$ANANSWER" -ge $THRESHOLD ]
 then
 	echo recursor-bulktest >> passed_tests
 	RETVAL=0