1252. [func] Report the current serial with periodic commits when

                        rolling forward the journal.

diff --git a/CHANGES b/CHANGES
index 32714c58369143afd5868aed8499aa1623f15c85..25a7fabc262b66eda94332bfc72cf36a58b48342 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1252.  [func]          Report the current serial with periodic commits when
+                       rolling forward the journal.
+
 1251.  [func]          Generate DNSSEC wildcard proofs.
 
 1250.  [bug]           When processing events (non-threaded) only allow

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 00ff0c8a16a100a51de7b0d28dfd36e5bf3df36c..9bfece488b033c4d6e1ba2580956348b9b447336 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.83 2001/11/30 01:59:09 gson Exp $ */
+/* $Id: journal.c,v 1.84 2002/07/22 02:06:04 marka Exp $ */
 
 #include <config.h>
 
@@ -1245,8 +1245,11 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
                rdata = NULL;
                dns_journal_current_rr(j, &name, &ttl, &rdata);
 
-               if (rdata->type == dns_rdatatype_soa)
+               if (rdata->type == dns_rdatatype_soa) {
                        n_soa++;
+                       if (n_soa == 2)
+                               db_serial = j->it.current_serial;
+               }
 
                if (n_soa == 3)
                        n_soa = 1;
@@ -1263,7 +1266,8 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 
                if (++n_put > 100)  {
                        isc_log_write(JOURNAL_DEBUG_LOGARGS(3),
-                                     "applying diff to database");
+                                     "applying diff to database (%u)",
+                                     db_serial);
                        (void)dns_diff_print(&diff, NULL);
                        CHECK(dns_diff_apply(&diff, db, ver));
                        dns_diff_clear(&diff);
@@ -1276,7 +1280,8 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 
        if (n_put != 0) {
                isc_log_write(JOURNAL_DEBUG_LOGARGS(3),
-                             "applying final diff to database");
+                             "applying final diff to database (%u)",
+                             db_serial);
                (void)dns_diff_print(&diff, NULL);
                CHECK(dns_diff_apply(&diff, db, ver));
                dns_diff_clear(&diff);