[svn] commit: r3170 - in /trunk: ChangeLog src/bin/xfrin/xfrin.py.in

[BIND 10 source code commits]

Author: zhanglikun
Date: Mon Oct 11 07:14:14 2010
New Revision: 3170

Log:
When xfrin can't connect with one zone's master, it should tell the bad news to zonemgr, so that zonemgr can reset the timer for that zone. 

Modified:
    trunk/ChangeLog
    trunk/src/bin/xfrin/xfrin.py.in

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Mon Oct 11 07:14:14 2010
@@ -1,3 +1,8 @@
+  106.  [bug]       zhang likun
+	When xfrin can't connect with one zone's master, it should tell
+	the bad news to zonemgr, so that zonemgr can reset the timer for
+	that zone. (Trac #329, r3169)
+
   105.  [bug]       Michal Vaner
 	Python processes: they no longer take 100% CPU while idle
 	due to a busy loop in reading command session in a nonblocking way.

Modified: trunk/src/bin/xfrin/xfrin.py.in
==============================================================================
--- trunk/src/bin/xfrin/xfrin.py.in (original)
+++ trunk/src/bin/xfrin/xfrin.py.in Mon Oct 11 07:14:14 2010
@@ -330,10 +330,14 @@
     sock_map = {}
     conn = XfrinConnection(sock_map, zone_name, rrclass, db_file,
                            shutdown_event, master_addrinfo, verbose)
+    ret = XFRIN_FAIL
     if conn.connect_to_master():
         ret = conn.do_xfrin(check_soa)
-        server.publish_xfrin_news(zone_name, rrclass, ret)
-
+    
+    # Publish the zone transfer result news, so zonemgr can reset the
+    # zone timer, and xfrout can notify the zone's slaves if the result
+    # is success.
+    server.publish_xfrin_news(zone_name, rrclass, ret)
     xfrin_recorder.decrement(zone_name)