Add CHANGES and release note for [GL #3739]

(cherry picked from commit 11df7f02fd546257f9c19ad0895e2b87cec4da2a)

diff --git a/CHANGES b/CHANGES
index bd681f202945bd56a6f702bb75855e45a71dc5c6..d425956fb3fb62461e9dd8858bf07b830935b524 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@
                        and add-soa options now take effect as expected when
                        named is reconfigured. [GL #3740]
 
+6049.  [bug]           Exclude ABD hashtables from the ADB memory
+                       overmem checks and don't clean ADB names
+                       and ADB entries used in the last 10 seconds
+                       (ADB_CACHE_MINIMUM). [GL #3739]
+
 6048.  [bug]           Fix a log message error in dns_catz_update_from_db(),
                        where serials with values of 2^31 or larger were logged
                        incorrectly as negative numbers. [GL #3742]

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index e52845b352ee3f1ffc80b2c57369b551e110ef33..7b925d0526fa8784249d10c6be7c9012eff19903 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -43,6 +43,12 @@ Bug Fixes
   times with the same server instead of trying a next available name server.
   This has been fixed. :gl:`#3637`
 
+- Recently used ADB names and ADB entries (IP addresses) could get cleaned when
+  ADB would be under memory pressure.  To mitigate this, count only actual ADB
+  names and ADB entries into the overmem memory limit (exclude internal memory
+  structures used for "housekeeping") and exclude recently used (<= 10 seconds)
+  ADB names and entries from the overmem memory cleaner. :gl:`#3739`
+
 Known Issues
 ~~~~~~~~~~~~