Add notes and change entry for [#2434]

This concludes the serve-stale improvements.

(cherry picked from commit ed8421693c9cd26586b6545f60c77bde006c12d9)

diff --git a/CHANGES b/CHANGES
index 3e239d929c0db2781f0e25103ec43ecefa25531d..0e281f9968c1687585a3a5852648ed059e172519 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+5579.  [func]          When serve-stale is enabled and stale data is available,
+                       named now returns stale answers upon encountering any
+                       unexpected error in the query resolution process.
+                       However, the "stale-refresh-time" window is still only
+                       started upon a timeout. [GL #2434]
+
 5578.  [protocol]      Make "check-names" accept A records below "_spf",
                        "_spf_rate" and "_spf_verify" labels in order to cater
                        for the "exists" SPF mechanism specified in RFC 7208

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 0fd5d15845b6a4c92bf90cbb9f4de2245ed6662b..1d9add401606050c44e9a436891ee4c94f546d2e 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -37,7 +37,7 @@ New Features
   to the size of a full zone transfer. This value cannot exceed
   100%, which is also the default. [GL #1515]
 
-- 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
@@ -52,7 +52,14 @@ 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]
+
+- When serve-stale is enabled and stale data is available, ``named`` now
+  returns stale answers upon encountering any unexpected error in the
+  query resolution process. This may happen, for example, if the
+  ``fetches-per-server`` or ``fetches-per-zone`` limits are reached. In
+  this case, ``named`` attempts to answer DNS requests with stale data,
+  but does not start the ``stale-refresh-time`` window. [GL #2434]
 
 Removed Features
 ~~~~~~~~~~~~~~~~