Commit 6817b32d authored by David Lawrence's avatar David Lawrence
Browse files

Revert "incremental cleaning should actually clean" because it already did.

dns_dbiterator_setcleanmode(cleaner->iterator, ISC_TRUE) causes
dns_dbiterator_current() to do node expiry.
parent c02efcf0
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: cache.c,v 1.42 2001/06/27 14:48:21 marka Exp $ */ /* $Id: cache.c,v 1.43 2001/06/27 20:18:03 tale Exp $ */
#include <config.h> #include <config.h>
...@@ -681,7 +681,6 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) { ...@@ -681,7 +681,6 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
isc_interval_t interval; isc_interval_t interval;
isc_result_t result; isc_result_t result;
int n_names; int n_names;
isc_stdtime_t now;
UNUSED(task); UNUSED(task);
...@@ -701,8 +700,6 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) { ...@@ -701,8 +700,6 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
REQUIRE(DNS_DBITERATOR_VALID(cleaner->iterator)); REQUIRE(DNS_DBITERATOR_VALID(cleaner->iterator));
isc_stdtime_get(&now);
while (n_names-- > 0) { while (n_names-- > 0) {
dns_dbnode_t *node = NULL; dns_dbnode_t *node = NULL;
...@@ -717,18 +714,6 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) { ...@@ -717,18 +714,6 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
return; return;
} }
result = dns_db_expirenode(cleaner->cache->db, node, now);
if (result != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"cache cleaner: "
"incremental_cleaning_action() "
"failed: %s",
dns_result_totext(result));
/*
* Continue anyway.
*/
}
/* /*
* The node was not needed, but was required by * The node was not needed, but was required by
* dns_dbiterator_current(). Give up its reference. * dns_dbiterator_current(). Give up its reference.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment