Add release note and change for [#2786]

(cherry picked from commit be87edd2494a09b3ee148381870a0ea1c05e8892)

diff --git a/CHANGES b/CHANGES
index 4310497bbdfe2ff1a0917ac748049f8c30dc86db..16b09122f8aefe38757fe62e070b5e2863f5fe54 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5671.  [bug]           Fix a race condition where two threads are competing for
+                       the same set of key file locks, that could lead to a
+                       deadlock. This has been fixed. [GL #2786]
+
 5670.  [bug]           Handle place holder KEYDATA records. [GL #2769]
 
 5669.  [func]          Add 'checkds' feature. Zones with "dnssec-policy" and

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 0d3bcff13e7b255a82b33a2f422e2c95ce8c6ad7..17df9676fd1e27bac4a86f20033c61eb85b4bf43 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -66,5 +66,5 @@ Bug Fixes
   locking key files for reading and writing, "in-view" logic was not taken into
   account. This has been fixed. :gl:`#2783`
 
-- Checking of ``dnssec-policy`` was broken. The checks failed to account for
-  ``dnssec-policy`` inheritance. :gl:`#2780`
+- Fix a race condition where two threads are competing for the same set of key
+  file locks, that could lead to a deadlock. This has been fixed. :gl:`#2786`