Add notes and change entry for [#2434]

This concludes the serve-stale improvements.

diff --git a/CHANGES b/CHANGES
index 44712112f0c5adeb9e05adb8b2ffedc591274bbb..63a2c54db171abad7c32ece63b32d2fe44071776 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5573.  [func]          Also return stale data if an error occurred and we are
+                       not resuming. Only start the stale-refresh-time window
+                       if we timed out. [GL #2434]
+
 5572.  [bug]           Address potential double free in generatexml.
                        [GL #2420]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index b459256ff6d0938ca2e91d539f7b086ab07a1104..600911bd2a32b50a6b5d614786538beb9c3fe2be 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -24,9 +24,7 @@ Known Issues
 New Features
 ~~~~~~~~~~~~
 
-- None.
-
-- A new option, ```stale-answer-client-timeout``, has been added to
+- A new option, ``stale-answer-client-timeout``, has been added to
   improve ``named``'s behavior with respect to serving stale data. The option
   defines the amount of time ``named`` waits before attempting
   to answer the query with a stale RRset from cache. If a stale answer
@@ -41,7 +39,13 @@ New Features
 
   The option can be disabled by setting the value to ``off`` or
   ``disabled``. It also has no effect if ``stale-answer-enable`` is
-  disabled.
+  disabled. [GL #2247]
+
+- Also return stale data if an error occurred and we are not resuming a
+  query (and serve-stale is enabled). This may happen for example if
+  ``fetches-per-server`` or ``fetches-per-zone` limits are reached. In this
+  case, we will try to answer DNS requests with stale data, but not start
+  the ``stale-refresh-time`` window. [GL #2434]
 
 Removed Features
 ~~~~~~~~~~~~~~~~