From e233f33fc3d16bd88053ac158f703b9d0be9bc0f Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Sun, 20 Jan 2019 22:54:01 -0800
Subject: [PATCH 1/2] add properly-formatted -D options to named.args files

this prevents servers that use arguments specified in named.args
from appearing different in 'ps' output from servers run with arguments
from start.pl

(cherry picked from commit 175d6e9bfb7085a70051d35a70b98debff3fddbe)
---
 bin/tests/system/additional/ns1/named.args  | 2 +-
 bin/tests/system/allow-query/ns3/named.args | 2 +-
 bin/tests/system/delzone/ns2/named.args     | 2 +-
 bin/tests/system/dnssec/ns6/named.args      | 2 +-
 bin/tests/system/dscp/ns1/named.args        | 2 +-
 bin/tests/system/dscp/ns2/named.args        | 2 +-
 bin/tests/system/dscp/ns3/named.args        | 2 +-
 bin/tests/system/dscp/ns4/named.args        | 2 +-
 bin/tests/system/dscp/ns5/named.args        | 2 +-
 bin/tests/system/dscp/ns6/named.args        | 2 +-
 bin/tests/system/dscp/ns7/named.args        | 2 +-
 bin/tests/system/fetchlimit/ns3/named.args  | 2 +-
 bin/tests/system/legacy/ns4/named.args      | 2 +-
 bin/tests/system/legacy/ns5/named.args      | 2 +-
 bin/tests/system/legacy/ns6/named.args      | 2 +-
 bin/tests/system/legacy/ns7/named.args      | 2 +-
 bin/tests/system/mkeys/ns2/named.args       | 2 +-
 bin/tests/system/mkeys/ns3/named.args       | 2 +-
 bin/tests/system/pipelined/ns3/named.args   | 2 +-
 bin/tests/system/resolver/ns7/named.args    | 2 +-
 bin/tests/system/rndc/ns6/named.args        | 2 +-
 bin/tests/system/rpz/ns5/named.args         | 3 +--
 22 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/bin/tests/system/additional/ns1/named.args b/bin/tests/system/additional/ns1/named.args
index 69787f69c27..39b8c1ae55b 100644
--- a/bin/tests/system/additional/ns1/named.args
+++ b/bin/tests/system/additional/ns1/named.args
@@ -1,2 +1,2 @@
 # this server runs named with only one worker thread
--m record,size,mctx -c named.conf -d 99 -X named.lock -g -T clienttest -n 1
+-m record,size,mctx -c named.conf -d 99 -D additional-ns1 -X named.lock -g -T clienttest -n 1
diff --git a/bin/tests/system/allow-query/ns3/named.args b/bin/tests/system/allow-query/ns3/named.args
index a8f679b8a24..0f50735bfd9 100644
--- a/bin/tests/system/allow-query/ns3/named.args
+++ b/bin/tests/system/allow-query/ns3/named.args
@@ -1,2 +1,2 @@
 # this server only has 127.0.0.1 in its localhost/localnets ACLs
--m record,size,mctx -c named.conf -d 99 -X named.lock -g -T clienttest -T fixedlocal
+-m record,size,mctx -c named.conf -d 99 -D allow-query-ns3 -X named.lock -g -T clienttest -T fixedlocal
diff --git a/bin/tests/system/delzone/ns2/named.args b/bin/tests/system/delzone/ns2/named.args
index bff47a94694..12588aa1966 100644
--- a/bin/tests/system/delzone/ns2/named.args
+++ b/bin/tests/system/delzone/ns2/named.args
@@ -1 +1 @@
--D ns2 -X named.lock -m record,size,mctx -T clienttest -c named.conf -g -U 4
+-D delzone-ns2 -X named.lock -m record,size,mctx -T clienttest -c named.conf -g -U 4
diff --git a/bin/tests/system/dnssec/ns6/named.args b/bin/tests/system/dnssec/ns6/named.args
index 04cf949bf66..f500166416e 100644
--- a/bin/tests/system/dnssec/ns6/named.args
+++ b/bin/tests/system/dnssec/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -X named.lock -g -T nonearest -T clienttest -T tat=1
+-m record,size,mctx -c named.conf -d 99 -D dnssec-ns6 -X named.lock -g -T nonearest -T clienttest -T tat=1
diff --git a/bin/tests/system/dscp/ns1/named.args b/bin/tests/system/dscp/ns1/named.args
index c9a059276d1..248cee7d557 100644
--- a/bin/tests/system/dscp/ns1/named.args
+++ b/bin/tests/system/dscp/ns1/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D dscp-ns1 -X named.lock -g -U 4 -T dscp=46
diff --git a/bin/tests/system/dscp/ns2/named.args b/bin/tests/system/dscp/ns2/named.args
index c9a059276d1..4a205add68a 100644
--- a/bin/tests/system/dscp/ns2/named.args
+++ b/bin/tests/system/dscp/ns2/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D dscp-ns2 -X named.lock -g -U 4 -T dscp=46
diff --git a/bin/tests/system/dscp/ns3/named.args b/bin/tests/system/dscp/ns3/named.args
index c9a059276d1..cf4a1821d65 100644
--- a/bin/tests/system/dscp/ns3/named.args
+++ b/bin/tests/system/dscp/ns3/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D dscp-ns3 -X named.lock -g -U 4 -T dscp=46
diff --git a/bin/tests/system/dscp/ns4/named.args b/bin/tests/system/dscp/ns4/named.args
index c9a059276d1..57678fe2fbb 100644
--- a/bin/tests/system/dscp/ns4/named.args
+++ b/bin/tests/system/dscp/ns4/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D dscp-ns4 -X named.lock -g -U 4 -T dscp=46
diff --git a/bin/tests/system/dscp/ns5/named.args b/bin/tests/system/dscp/ns5/named.args
index c9a059276d1..83824885881 100644
--- a/bin/tests/system/dscp/ns5/named.args
+++ b/bin/tests/system/dscp/ns5/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D dscp-ns5 -X named.lock -g -U 4 -T dscp=46
diff --git a/bin/tests/system/dscp/ns6/named.args b/bin/tests/system/dscp/ns6/named.args
index c9a059276d1..482dd408708 100644
--- a/bin/tests/system/dscp/ns6/named.args
+++ b/bin/tests/system/dscp/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D dscp-ns6 -X named.lock -g -U 4 -T dscp=46
diff --git a/bin/tests/system/dscp/ns7/named.args b/bin/tests/system/dscp/ns7/named.args
index c9a059276d1..0528448c11c 100644
--- a/bin/tests/system/dscp/ns7/named.args
+++ b/bin/tests/system/dscp/ns7/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T dscp=46
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D dscp-ns7 -X named.lock -g -U 4 -T dscp=46
diff --git a/bin/tests/system/fetchlimit/ns3/named.args b/bin/tests/system/fetchlimit/ns3/named.args
index 4f737fc4c30..1d7ee742c5b 100644
--- a/bin/tests/system/fetchlimit/ns3/named.args
+++ b/bin/tests/system/fetchlimit/ns3/named.args
@@ -1,2 +1,2 @@
 # Don't specify '-T clienttest' as it consumes lots of memory with this test
--D ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4
+-D fetchlimit-ns3 -X named.lock -m record,size,mctx -c named.conf -d 99 -g -U 4
diff --git a/bin/tests/system/legacy/ns4/named.args b/bin/tests/system/legacy/ns4/named.args
index 3c5fde60c10..1f118009270 100644
--- a/bin/tests/system/legacy/ns4/named.args
+++ b/bin/tests/system/legacy/ns4/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T noedns
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D legacy-ns4 -X named.lock -g -U 4 -T noedns
diff --git a/bin/tests/system/legacy/ns5/named.args b/bin/tests/system/legacy/ns5/named.args
index 3c5fde60c10..54aa083f261 100644
--- a/bin/tests/system/legacy/ns5/named.args
+++ b/bin/tests/system/legacy/ns5/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T noedns
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D legacy-ns5 -X named.lock -g -U 4 -T noedns
diff --git a/bin/tests/system/legacy/ns6/named.args b/bin/tests/system/legacy/ns6/named.args
index ac08197b8b2..b9a278ec571 100644
--- a/bin/tests/system/legacy/ns6/named.args
+++ b/bin/tests/system/legacy/ns6/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T maxudp512
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D legacy-ns6 -X named.lock -g -U 4 -T maxudp512
diff --git a/bin/tests/system/legacy/ns7/named.args b/bin/tests/system/legacy/ns7/named.args
index ac08197b8b2..fbe0ebfa1d3 100644
--- a/bin/tests/system/legacy/ns7/named.args
+++ b/bin/tests/system/legacy/ns7/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -U 4 -T maxudp512
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D legacy-ns7 -X named.lock -g -U 4 -T maxudp512
diff --git a/bin/tests/system/mkeys/ns2/named.args b/bin/tests/system/mkeys/ns2/named.args
index 5c5a6b2521f..614243233d4 100644
--- a/bin/tests/system/mkeys/ns2/named.args
+++ b/bin/tests/system/mkeys/ns2/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -T mkeytimers=5/10/20 -T tat=1
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D mkeys-ns2 -X named.lock -g -T mkeytimers=5/10/20 -T tat=1
diff --git a/bin/tests/system/mkeys/ns3/named.args b/bin/tests/system/mkeys/ns3/named.args
index 02f8f670f69..b8fb0085623 100644
--- a/bin/tests/system/mkeys/ns3/named.args
+++ b/bin/tests/system/mkeys/ns3/named.args
@@ -1 +1 @@
--m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -T mkeytimers=5/10/20
+-m record,size,mctx -T clienttest -c named.conf -d 99 -D mkeys-ns3 -X named.lock -g -T mkeytimers=5/10/20
diff --git a/bin/tests/system/pipelined/ns3/named.args b/bin/tests/system/pipelined/ns3/named.args
index 51b9cc34dd3..bd8140ba810 100644
--- a/bin/tests/system/pipelined/ns3/named.args
+++ b/bin/tests/system/pipelined/ns3/named.args
@@ -1 +1 @@
--m record,size,mctx -c named.conf -d 99 -X named.lock -g -T delay=200
+-m record,size,mctx -c named.conf -d 99 -D pipelined-ns3 -X named.lock -g -T delay=200
diff --git a/bin/tests/system/resolver/ns7/named.args b/bin/tests/system/resolver/ns7/named.args
index fc8ffac3cc2..1e4a9bf3258 100644
--- a/bin/tests/system/resolver/ns7/named.args
+++ b/bin/tests/system/resolver/ns7/named.args
@@ -1,2 +1,2 @@
 # this server runs named with the "-T clienttest" option omitted
--m record,size,mctx -c named.conf -d 99 -X named.lock -g
+-m record,size,mctx -c named.conf -d 99 -D resolver-ns7 -X named.lock -g
diff --git a/bin/tests/system/rndc/ns6/named.args b/bin/tests/system/rndc/ns6/named.args
index cb7f5eeddab..479c740f814 100644
--- a/bin/tests/system/rndc/ns6/named.args
+++ b/bin/tests/system/rndc/ns6/named.args
@@ -1,3 +1,3 @@
 # teardown of a huge zone with tracing enabled takes way too long 
 # -m none is set so that stop.pl does not timeout
--X named.lock -m none -T clienttest -c named.conf -d 99 -g -U 4
\ No newline at end of file
+-D rndc-ns6 -X named.lock -m none -T clienttest -c named.conf -d 99 -g -U 4
diff --git a/bin/tests/system/rpz/ns5/named.args b/bin/tests/system/rpz/ns5/named.args
index 9b2a0bb26e5..5ff9e54e3e2 100644
--- a/bin/tests/system/rpz/ns5/named.args
+++ b/bin/tests/system/rpz/ns5/named.args
@@ -1,3 +1,2 @@
 # run the performace test close to real life
-
--c named.conf -X named.lock -gd3
+-c named.conf -D rpz-ns5 -X named.lock -gd3
-- 
GitLab


From 96bf857b6561a71bd8ef76b93fbd8afeb6adfaa8 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Mon, 28 Jan 2019 18:11:57 -0800
Subject: [PATCH 2/2] also add -D options for transient named processes started
 in tests.sh

(cherry picked from commit dd45831acc06b15e5814b7ce3eec903d2db23904)
---
 bin/tests/system/logfileconfig/tests.sh | 2 +-
 bin/tests/system/rrl/tests.sh           | 2 +-
 bin/tests/system/runtime/tests.sh       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index 650ccca9cc0..1a43b27a3cb 100644
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -36,7 +36,7 @@ DLFILE="named_deflog"
 
 PIDFILE="${THISDIR}/${CONFDIR}/named.pid"
 myRNDC="$RNDC -c ${THISDIR}/${CONFDIR}/rndc.conf"
-myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record,size,mctx -T clienttest -T nosyslog -d 99 -X named.lock -U 4"
+myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record,size,mctx -T clienttest -T nosyslog -d 99 -D logfileconfig-ns1 -X named.lock -U 4"
 
 # Test given condition.  If true, test again after a second.  Used for testing
 # filesystem-dependent conditions in order to prevent false negatives caused by
diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index 942cbbf1b49..977950f713c 100644
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -273,7 +273,7 @@ $DIG $DIGOPTS @$ns4 A a7.tld4 > /dev/null 2>&1
 grep "would limit" ns4/named.run >/dev/null 2>&1 ||
 setret "\"would limit\" not found in log file."
 
-$NAMED -gc broken.conf > broken.out 2>&1 & 
+$NAMED -D rrl-ns5 -gc broken.conf > broken.out 2>&1 &
 sleep 2
 grep "min-table-size 1" broken.out > /dev/null || setret "min-table-size 0 was not changed to 1"
 
diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index 9dc43acd1df..95db36bd3aa 100644
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -49,7 +49,7 @@ fi
 n=`expr $n + 1`
 echo_i "verifying that named checks for conflicting named processes ($n)"
 ret=0
-(cd ns2; $NAMED -c named-alt2.conf -D ns2-extra-2 -X named.lock -m record,size,mctx -d 99 -g -U 4 >> named3.run 2>&1 & )
+(cd ns2; $NAMED -c named-alt2.conf -D runtime-ns2-extra-2 -X named.lock -m record,size,mctx -d 99 -g -U 4 >> named3.run 2>&1 & )
 sleep 2
 grep "another named process" ns2/named3.run > /dev/null || ret=1
 pid=`cat ns2/named3.pid 2>/dev/null`
@@ -60,7 +60,7 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 echo_i "verifying that 'lock-file none' disables process check ($n)"
 ret=0
-(cd ns2; $NAMED -c named-alt3.conf -D ns2-extra-3 -m record,size,mctx -d 99 -g -U 4 >> named4.run 2>&1 & )
+(cd ns2; $NAMED -c named-alt3.conf -D runtime-ns2-extra-3 -m record,size,mctx -d 99 -g -U 4 >> named4.run 2>&1 & )
 sleep 2
 grep "another named process" ns2/named4.run > /dev/null && ret=1
 pid=`cat ns2/named4.pid 2>/dev/null`
@@ -105,7 +105,7 @@ n=`expr $n + 1`
 echo_i "checking that named refuses to start if working directory is not writable ($n)"
 ret=0
 cd ns2
-$NAMED -c named-alt4.conf -d 99 -g > named4.run 2>&1 &
+$NAMED -c named-alt4.conf -D runtime-ns2-extra-4 -d 99 -g > named4.run 2>&1 &
 sleep 2
 grep "exiting (due to fatal error)" named4.run > /dev/null || ret=1
 # pidfile could be in either place depending on whether the directory
@@ -122,7 +122,7 @@ n=`expr $n + 1`
 echo_i "checking that named refuses to start if managed-keys-directory is not writable ($n)"
 ret=0
 cd ns2
-$NAMED -c named-alt5.conf -d 99 -g > named5.run 2>&1 &
+$NAMED -c named-alt5.conf -D runtime-ns2-extra-5 -d 99 -g > named5.run 2>&1 &
 sleep 2
 grep "exiting (due to fatal error)" named5.run > /dev/null || ret=1
 # pidfile could be in either place depending on whether the directory
-- 
GitLab