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

oldest query or refusing to recurse due to quota.
                        [RT #19022]
This commit is contained in:
Mark Andrews
2008-12-08 06:39:42 +00:00
parent 5938a4d682
commit 69f0cf898e
2 changed files with 15 additions and 3 deletions

View File

@@ -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]

View File

@@ -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);