rcu: protect also zonefile flush and XFRout against simultaneous zone CTL update

1 files changed, 13 insertions, 4 deletions

diff --git a/tests-extra/tests/ctl/notify_x_upd/test.py b/tests-extra/tests/ctl/notify_x_upd/test.py
index eee936679..5e33b3715 100644
--- a/tests-extra/tests/ctl/notify_x_upd/test.py
+++ b/tests-extra/tests/ctl/notify_x_upd/test.py
@@ -1,18 +1,25 @@
 #!/usr/bin/env python3
 
-'''Test of crash when NOTIFY is sent during zone CTL update.'''
+'''Test of crash when NOTIFY or flush is executed during zone CTL update.'''
 
 from dnstest.utils import *
 from dnstest.test import Test
 import random
 import threading
 import time
+import os
+
+scenario_flush = random.choice([False, True])
 
 loop_stop = False
 
 def background_notify(server, zone_name):
+    global scenario_flush
     try:
-        server.ctl("zone-notify " + zone_name)
+        if scenario_flush:
+            server.ctl("-f zone-flush " + zone_name)
+        else:
+            server.ctl("zone-notify " + zone_name)
     except:
         pass
 
@@ -28,7 +35,7 @@ t = Test()
 
 master = t.server("knot")
 slave = t.server("knot")
-zones = t.zone_rnd(1, dnssec=False, records=40)
+zones = t.zone_rnd(1, dnssec=False, records=800)
 t.link(zones, master, slave)
 ZONE = zones[0].name
 
@@ -40,7 +47,9 @@ try:
 
     for i in range(10):
         master.ctl("zone-begin " + ZONE)
-        master.ctl("zone-set %s dhowedhhjewodw 3600 A 1.2.3.%d" % (ZONE, i + 1))
+        master.ctl("zone-set %s zzzzzzzzzzzzzz%d 3600 A 1.2.3.%d" % (ZONE, i + 1, i + 1))
+        if i > 0:
+            master.ctl("zone-unset %s zzzzzzzzzzzzzz%d A" % (ZONE, i))
         master.ctl("zone-commit " + ZONE)
 finally:
     loop_stop = True