From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 28 Jan 2021 16:02:56 +0000 (+0100)
Subject: Add notes and change entry for [#2434]
X-Git-Tag: v9.17.10~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed8421693c9cd26586b6545f60c77bde006c12d9;p=thirdparty%2Fbind9.git

Add notes and change entry for [#2434]

This concludes the serve-stale improvements.
---

diff --git a/CHANGES b/CHANGES
index 44712112f0c..63a2c54db17 100644
--- 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 b459256ff6d..600911bd2a3 100644
--- 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
 ~~~~~~~~~~~~~~~~