From 2bbff06d3631653fcea95e223da47aea0f9cdf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Tue, 20 Feb 2018 13:59:28 +0100 Subject: [PATCH] Wait until a cache dump completes instead of waiting for a fixed amount of time Dumping the cache is an asynchronous operation, so sleeping for a fixed amount of time after running "rndc dumpdb" is imperfect as dumping cache contents may take longer than expected on slower machines. Instead of always sleeping for 1 second, wait until the "; Dump complete" line appears in the dump or 10 seconds pass, whichever comes first. --- bin/tests/system/cacheclean/tests.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh index 9f69e00510..002f61f3ef 100644 --- a/bin/tests/system/cacheclean/tests.sh +++ b/bin/tests/system/cacheclean/tests.sh @@ -57,7 +57,11 @@ EOF dump_cache () { $RNDC $RNDCOPTS dumpdb -cache _default - sleep 1 + for i in 0 1 2 3 4 5 6 7 8 9 + do + grep '^; Dump complete$' ns2/named_dump.db > /dev/null && break + sleep 1 + done mv ns2/named_dump.db ns2/named_dump.db.$n }