Add CHANGES and release note for [GL #4596]

(cherry picked from commit f44755766775ca5a0b08e73986a91675d5c294b9)
(cherry picked from commit f255ab3bf7b9cd350708e720c51bf67707f6fc74)

diff --git a/CHANGES b/CHANGES
index 662106db0fad18f64f142e9afa34df5cfd4a70b6..1cee1334fb12f4de96ad1bef24af4b9ff824e1fa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6352.  [bug]           Revert change 6319 and decrease lock contention during
+                       RBTDB tree pruning by not cleaning up nodes recursively
+                       within a single prune_tree() call. [GL #4596]
+
 6350.  [bug]           Address use after free in expire_lru_headers. [GL #4495]
 
        --- 9.18.24 released ---

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 16e6a84f3589051771dc2d7292aadeaf7e9c4035..cd16ecdbec889a017221784954001104e1d46c7b 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -41,6 +41,11 @@ Bug Fixes
   ISC would like to thank to Jinmei Tatuya from Infoblox for bringing
   this issue to our attention.
 
+- A regression in cache-cleaning code enabled memory use to grow
+  significantly more quickly than before, until the configured
+  :any:`max-cache-size` limit was reached. This has been fixed.
+  :gl:`#4596`
+
 
 Known Issues
 ~~~~~~~~~~~~