Add CHANGES and release note for [GL #4596]

(cherry picked from commit 774204ea743f46b1d1771df5e51764e7fc5dbdca)

diff --git a/CHANGES b/CHANGES
index ced0e309a45584597f7fb4432180d9fe36b4e8cd..0cbc6801537d580a328777f26483e03858943fcf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+6352.  [bug]           Decrease lock contention during RBTDB tree pruning
+                       introduced in change 6319 by making the prunenodes list
+                       bucketed and 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.16.48 released ---

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index ed190b103e1fd295287dd0855fe7267ad53d6c9b..c70f4d0f85be8628064259652dfe7846313dea8d 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -35,7 +35,9 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- A regression in cache-cleaning code enabled memory use to grow
+  significantly more quickly than before, until the configured
+  ``max-cache-size`` limit was reached. This has been fixed. :gl:`#4596`
 
 - A use-after-free assertion might get triggered when the overmem cache
   cleaning triggers. :gl:`#4595`