Collect some stats

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 27fbf75fb1ab66eed890fed636a2795d55e0dfef..f95b55346b80ddcb7dbbbc28abb111b05abec677 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -967,6 +967,7 @@ jobs:
           command: |
             DNSBULKTEST=/usr/bin/dnsbulktest \
             RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor \
+            RECCONTROL=/opt/pdns-recursor/bin/rec_control \
             THRESHOLD=95 \
             TRACE=no \
             ./timestamp ./recursor-test 5300 50000 2
@@ -976,6 +977,7 @@ jobs:
           command: |
             DNSBULKTEST=/usr/bin/dnsbulktest \
             RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor \
+            RECCONTROL=/opt/pdns-recursor/bin/rec_control \
             THRESHOLD=95 \
             TRACE=no \
             ./timestamp ./recursor-test 5300 50000 4
@@ -985,6 +987,7 @@ jobs:
           command: |
             DNSBULKTEST=/usr/bin/dnsbulktest \
             RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor \
+            RECCONTROL=/opt/pdns-recursor/bin/rec_control \
             THRESHOLD=95 \
             TRACE=no \
             ./timestamp ./recursor-test 5300 50000 8
@@ -994,6 +997,7 @@ jobs:
           command: |
             DNSBULKTEST=/usr/bin/dnsbulktest \
             RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor \
+            RECCONTROL=/opt/pdns-recursor/bin/rec_control \
             THRESHOLD=95 \
             TRACE=no \
             ./timestamp ./recursor-test 5300 50000 16
@@ -1003,6 +1007,7 @@ jobs:
           command: |
             DNSBULKTEST=/usr/bin/dnsbulktest \
             RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor \
+            RECCONTROL=/opt/pdns-recursor/bin/rec_control \
             THRESHOLD=95 \
             TRACE=no \
             ./timestamp ./recursor-test 5300 50000 2 4096
@@ -1012,6 +1017,7 @@ jobs:
           command: |
             DNSBULKTEST=/usr/bin/dnsbulktest \
             RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor \
+            RECCONTROL=/opt/pdns-recursor/bin/rec_control \
             THRESHOLD=95 \
             TRACE=no \
             ./timestamp ./recursor-test 5300 50000 4 4096
@@ -1021,6 +1027,7 @@ jobs:
           command: |
             DNSBULKTEST=/usr/bin/dnsbulktest \
             RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor \
+            RECCONTROL=/opt/pdns-recursor/bin/rec_control \
             THRESHOLD=95 \
             TRACE=no \
             ./timestamp ./recursor-test 5300 50000 8 4096
@@ -1030,6 +1037,7 @@ jobs:
           command: |
             DNSBULKTEST=/usr/bin/dnsbulktest \
             RECURSOR=/opt/pdns-recursor/sbin/pdns_recursor \
+            RECCONTROL=/opt/pdns-recursor/bin/rec_control \
             THRESHOLD=95 \
             TRACE=no \
             ./timestamp ./recursor-test 5300 50000 16 4096

diff --git a/regression-tests/recursor-test b/regression-tests/recursor-test
index 1033bab66bb8f0299243f66d2cef9dd7ce6f9397..9a8ebfed30e46838b9de69b6e1ead5b5084f38c7 100755 (executable)
--- a/regression-tests/recursor-test
+++ b/regression-tests/recursor-test
@@ -9,6 +9,7 @@ mthreads=$4
 [ -z "$mthreads" ] && mthreads=100
 
 : ${RECURSOR:="../pdns/recursordist/pdns_recursor"}
+: ${RECCONTROL:="../pdns/recursordist/rec_control"}
 : ${CSV:="top-1m.csv"}
 : ${IPv6:="0"}
 : ${TRACE:="fail"}
@@ -35,20 +36,27 @@ sleep 3
 echo
 echo === First run with limit=$limit threads=$threads mthreads=$mthreads ===
 ${DNSBULKTEST} --www=false -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.results
+kill -USR1 $(cat pdns_recursor.pid)
+${RECCONTROL} --socket-dir=. --config-dir=. get-all
 # rerun 1 with hot cache
 echo
 echo === Second run with limit=$limit threads=$threads mthreads=$mthreads ===
 ${DNSBULKTEST} --www=false -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.results
+kill -USR1 $(cat pdns_recursor.pid)
+${RECCONTROL} --socket-dir=. --config-dir=. get-all
 # rerun 2 with hot cache
 echo
 echo === Third run with limit=$limit threads=$threads mthreads=$mthreads ===
 ${DNSBULKTEST} --www=false -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.results
+kill -USR1 $(cat pdns_recursor.pid)
+${RECCONTROL} --socket-dir=. --config-dir=. get-all
 
+sleep 1
 echo
 echo "=== RECURSOR LOG ==="
 cat recursor.log
 echo "=== END RECURSOR LOG ==="
-kill $(cat pdns_recursor.pid)
+kill $(cat pdns_recursor.pid) 
 sleep 5
 
 . ./bulktest.results