Add CHANGES and release note for [GL #4596]

(cherry picked from commit f44755766775ca5a0b08e73986a91675d5c294b9)

diff --git a/CHANGES b/CHANGES
index 6bca7cc194365d2c4bf891bf07bcabcbf5b494ad..d0dfc8d5b886716a54277debf65f83ef18cbabde 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]
+
 6351.  [protocol]      Support for the RESINFO record type has been added.
                        [GL #4413]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 325eced5b37ac59d99cde8c167c96d35537274c5..cd69f34068534c4e4ed8cbdb663eaa6e0318c3c3 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -36,6 +36,11 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
+- 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`
+
 - Changes to ``listen-on`` statements were ignored on reconfiguration
   unless the port or interface address was changed, making it
   impossible to change a related listener transport type. That issue