[Opendnssec-commits] matthijs r6939 - in trunk/OpenDNSSEC: . signer/doc signer/src/adapter signer/src/daemon signer/src/shared

commits at svn.opendnssec.org commits at svn.opendnssec.org
Thu Jan 10 16:04:01 CET 2013


Author: matthijs
Date: Thu Jan 10 16:04:01 2013
New Revision: 6939
URL: http://fisheye.opendnssec.org/changelog/opendnssec?cs=6939

Log:
OPENDNSSEC-350: Improve the logging when there are problems with the inbound xfr

Also, update task->what with current task, so that when for example read fails,
we don't have to redo the signconf task.

+ rm strange line in Changelog

Modified:
   trunk/OpenDNSSEC/NEWS
   trunk/OpenDNSSEC/signer/doc/Changelog
   trunk/OpenDNSSEC/signer/src/adapter/addns.c
   trunk/OpenDNSSEC/signer/src/daemon/worker.c
   trunk/OpenDNSSEC/signer/src/shared/status.c
   trunk/OpenDNSSEC/signer/src/shared/status.h

Modified: trunk/OpenDNSSEC/NEWS
==============================================================================
--- trunk/OpenDNSSEC/NEWS	Thu Jan 10 15:56:32 2013	(r6938)
+++ trunk/OpenDNSSEC/NEWS	Thu Jan 10 16:04:01 2013	(r6939)
@@ -3,6 +3,7 @@
 
 OpenDNSSEC 1.4.0-trunk
 
+* OPENDNSSEC-350: Better log message when IXFR is not ready for reading.
 
 
 OpenDNSSEC 1.4.0rc1 - 2013-01-10

Modified: trunk/OpenDNSSEC/signer/doc/Changelog
==============================================================================
--- trunk/OpenDNSSEC/signer/doc/Changelog	Thu Jan 10 15:56:32 2013	(r6938)
+++ trunk/OpenDNSSEC/signer/doc/Changelog	Thu Jan 10 16:04:01 2013	(r6939)
@@ -125,8 +125,6 @@
   has not changed. 
 - OPENDNSSEC-231: Allow for Classless IN-ADDR.ARPA names (RFC 2317).
 
-ods-signer broken for reverse classless delegations
-
 20 March 2012: Matthijs
 - OPENDNSSEC-164: A new way to backup
 - OPENDNSSEC-226: Listener should be configured with Address, not IPv{4,6}.

Modified: trunk/OpenDNSSEC/signer/src/adapter/addns.c
==============================================================================
--- trunk/OpenDNSSEC/signer/src/adapter/addns.c	Thu Jan 10 15:56:32 2013	(r6938)
+++ trunk/OpenDNSSEC/signer/src/adapter/addns.c	Thu Jan 10 16:04:01 2013	(r6939)
@@ -666,7 +666,7 @@
         z->xfrd->serial_disk_acquired <= z->xfrd->serial_xfr_acquired) {
         lock_basic_unlock(&z->xfrd->serial_lock);
         lock_basic_unlock(&z->xfrd->rw_lock);
-        return ODS_STATUS_UNCHANGED;
+        return ODS_STATUS_XFR_NOT_READY;
     }
     /* copy zone transfers */
     xfrfile = ods_build_path(z->name, ".xfrd", 0, 1);

Modified: trunk/OpenDNSSEC/signer/src/daemon/worker.c
==============================================================================
--- trunk/OpenDNSSEC/signer/src/daemon/worker.c	Thu Jan 10 15:56:32 2013	(r6938)
+++ trunk/OpenDNSSEC/signer/src/daemon/worker.c	Thu Jan 10 16:04:01 2013	(r6939)
@@ -344,6 +344,7 @@
             /* perform 'read input adapter' task */
             worker_working_with(worker, TASK_READ, TASK_SIGN,
                 "read", task_who2str(task), &what, &when);
+            task->what = TASK_READ;
             if (!zone->signconf->last_modified) {
                 ods_log_debug("[%s[%i]] no signconf.xml for zone %s yet",
                     worker2str(worker->type), worker->thread_num,
@@ -369,6 +370,7 @@
             /* perform 'sign' task */
             worker_working_with(worker, TASK_SIGN, TASK_WRITE,
                 "sign", task_who2str(task), &what, &when);
+            task->what = TASK_SIGN;
             status = zone_update_serial(zone);
             if (status == ODS_STATUS_OK) {
                 if (task->interrupt > TASK_SIGNCONF) {
@@ -433,6 +435,7 @@
             /* perform 'write to output adapter' task */
             worker_working_with(worker, TASK_WRITE, TASK_SIGN,
                 "write", task_who2str(task), &what, &when);
+            task->what = TASK_WRITE;
             status = tools_output(zone, engine);
             if (status == ODS_STATUS_OK) {
                 if (task->interrupt > TASK_SIGNCONF) {

Modified: trunk/OpenDNSSEC/signer/src/shared/status.c
==============================================================================
--- trunk/OpenDNSSEC/signer/src/shared/status.c	Thu Jan 10 15:56:32 2013	(r6938)
+++ trunk/OpenDNSSEC/signer/src/shared/status.c	Thu Jan 10 16:04:01 2013	(r6939)
@@ -78,6 +78,8 @@
     { ODS_STATUS_UNCHANGED, "Status unchanged"},
     { ODS_STATUS_WRITE_PIDFILE_ERR, "Unable to write process id to pidfile"},
     { ODS_STATUS_XML_ERR, "XML error"},
+
+    { ODS_STATUS_XFR_NOT_READY, "Incoming zone transfer not ready"},
     { 0, NULL }
 };
 

Modified: trunk/OpenDNSSEC/signer/src/shared/status.h
==============================================================================
--- trunk/OpenDNSSEC/signer/src/shared/status.h	Thu Jan 10 15:56:32 2013	(r6938)
+++ trunk/OpenDNSSEC/signer/src/shared/status.h	Thu Jan 10 16:04:01 2013	(r6939)
@@ -77,7 +77,9 @@
     ODS_STATUS_SETSID_ERR,
     ODS_STATUS_UNCHANGED,
     ODS_STATUS_WRITE_PIDFILE_ERR,
-    ODS_STATUS_XML_ERR
+    ODS_STATUS_XML_ERR,
+
+    ODS_STATUS_XFR_NOT_READY
 };
 typedef enum ods_enum_status ods_status;
 



More information about the Opendnssec-commits mailing list