2507. [func] Log the recursion quota values when killing the

                        oldest query or refusing to recurse due to quota.
                        [RT #19022]

diff --git a/CHANGES b/CHANGES
index 7e8752d807a70da04f052d49cc2c9bda7b0abe51..765b8525434e26344c5b32e8089d30657f9cfee6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2507.  [func]          Log the recursion quota values when killing the
+                       oldest query or refusing to recurse due to quota.
+                       [RT #19022]
+
 2506.  [port]          solaris: Check at configure time if 
                        hack_shutup_pthreadonceinit is needed. [RT #19037]
 

diff --git a/bin/named/query.c b/bin/named/query.c
index cacd70acbb83d6a140a7039cb80bce7b240c88a4..5ab41a234ff639e799ffef711d24764dc70ce4ce 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.313 2008/11/03 23:57:22 marka Exp $ */
+/* $Id: query.c,v 1.314 2008/12/08 06:39:42 marka Exp $ */
 
 /*! \file */
 
@@ -3187,7 +3187,11 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain,
                                              NS_LOGMODULE_QUERY,
                                              ISC_LOG_WARNING,
                                              "recursive-clients soft limit "
-                                             "exceeded, aborting oldest query");
+                                             "exceeded (%d/%d/%d), "
+                                             "aborting oldest query",
+                                             client->recursionquota->used,
+                                             client->recursionquota->soft,
+                                             client->recursionquota->max);
                        }
                        ns_client_killoldestquery(client);
                        result = ISC_R_SUCCESS;
@@ -3200,7 +3204,11 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain,
                                ns_client_log(client, NS_LOGCATEGORY_CLIENT,
                                              NS_LOGMODULE_QUERY,
                                              ISC_LOG_WARNING,
-                                             "no more recursive clients: %s",
+                                             "no more recursive clients "
+                                             "(%d/%d/%d): %s",
+                                             ns_g_server->recursionquota.used,
+                                             ns_g_server->recursionquota.soft,
+                                             ns_g_server->recursionquota.max,
                                              isc_result_totext(result));
                        }
                        ns_client_killoldestquery(client);