From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 29 Apr 2022 13:14:00 +0000 (+0000)
Subject: Add debug print lines to the new test_XFRIncomplete that fails occasionally on GH... 
X-Git-Tag: auth-4.8.0-alpha0~109^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8e8ec462c7c858fe28bf6e88525e099e414b477;p=thirdparty%2Fpdns.git

Add debug print lines to the new test_XFRIncomplete that fails occasionally on GH Actions.

Using a slow loaded VM I could reproduce these failures once in a while.
Adding the print statements made the failures go away. Maybe some form
of synchronization is going on with the extra debug I/O?  Committing this
to see what happens on GH Actions.
---

diff --git a/regression-tests.auth-py/test_XFRIncomplete.py b/regression-tests.auth-py/test_XFRIncomplete.py
index 5a9c10a648..aef9016f0f 100644
--- a/regression-tests.auth-py/test_XFRIncomplete.py
+++ b/regression-tests.auth-py/test_XFRIncomplete.py
@@ -25,11 +25,13 @@ class BadXFRServer(object):
 
     def moveToSerial(self, newSerial):
         if newSerial == self._currentSerial:
+            print("newSerial == self._currentSerial", file=sys.stderr)
             return False
 
         #if newSerial != self._currentSerial + 1:
         #    raise AssertionError("Asking the XFR server to serve serial %d, already serving %d" % (newSerial, self._currentSerial))
         self._targetSerial = newSerial
+        print("moveToSerial %d" % newSerial, file=sys.stderr)
         return True
 
     def _getAnswer(self, message):
@@ -73,11 +75,13 @@ class BadXFRServer(object):
     def _connectionHandler(self, conn):
         data = None
         while True:
+            print("Reading from connection...", file=sys.stderr)
             data = conn.recv(2)
             if not data:
                 break
             (datalen,) = struct.unpack("!H", data)
             data = conn.recv(datalen)
+            print("Received request with len %d" % datalen, file=sys.stderr)
             if not data:
                 break
 
@@ -88,6 +92,7 @@ class BadXFRServer(object):
             if not message.question[0].rdtype in [dns.rdatatype.AXFR, dns.rdatatype.IXFR]:
                 print('Invalid query, qtype is %d' % (message.question.rdtype), file=sys.stderr)
                 break
+            print(message, file=sys.stderr)
             (serial, answer) = self._getAnswer(message)
             if not answer:
                 print('Unable to get a response for %s %d' % (message.question[0].name, message.question[0].rdtype), file=sys.stderr)
@@ -96,9 +101,11 @@ class BadXFRServer(object):
             wire = answer.to_wire()
             conn.send(struct.pack("!H", len(wire)))
             conn.send(wire)
+            print("_currentSerial to %d" % serial, file=sys.stderr)
             self._currentSerial = serial
             break
 
+        print("_connectionHandler: stop", file=sys.stderr)
         conn.close()
 
     def _listener(self):
@@ -114,6 +121,7 @@ class BadXFRServer(object):
         while True:
             try:
                 (conn, _) = sock.accept()
+                print("New connection", file=sys.stderr)
                 thread = threading.Thread(name='IXFR Connection Handler',
                                       target=self._connectionHandler,
                                       args=[conn])
@@ -143,6 +151,8 @@ query-cache-ttl=0
 domain-metadata-cache-ttl=0
 negquery-cache-ttl=0
 slave-cycle-interval=1
+#loglevel=9
+#axfr-fetch-timeout=20
 """
 
     @classmethod
@@ -151,7 +161,7 @@ slave-cycle-interval=1
         os.system("$PDNSUTIL --config-dir=configs/auth create-slave-zone zone.rpz. 127.0.0.1:%s" % (badxfrServerPort,))
         os.system("$PDNSUTIL --config-dir=configs/auth set-meta zone.rpz. IXFR 1")
     
-    def waitUntilCorrectSerialIsLoaded(self, serial, timeout=5):
+    def waitUntilCorrectSerialIsLoaded(self, serial, timeout=20):
         global badxfrServer
 
         badxfrServer.moveToSerial(serial)