BIND 10 trac1279, updated. 56d8610a9e10792048a10cce86196deee928e203 [1279] Retry with AXFR if IXFR fails
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Oct 19 12:58:55 UTC 2011
The branch, trac1279 has been updated
via 56d8610a9e10792048a10cce86196deee928e203 (commit)
via 9a4db0085e43df8d8facd885eb9c9a0b52280090 (commit)
from 1f311bbc22d17a747ad394ffd00cb130f2999ede (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 56d8610a9e10792048a10cce86196deee928e203
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Wed Oct 19 14:55:05 2011 +0200
[1279] Retry with AXFR if IXFR fails
commit 9a4db0085e43df8d8facd885eb9c9a0b52280090
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Wed Oct 19 14:38:05 2011 +0200
[1279] Tests for the AXFR fallback
-----------------------------------------------------------------------
Summary of changes:
src/bin/xfrin/tests/xfrin_test.py | 123 +++++++++++++++++++++++++++++++++++++
src/bin/xfrin/xfrin.py.in | 27 ++++++---
src/bin/xfrin/xfrin_messages.mes | 6 ++
3 files changed, 148 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py
index 65bd968..485d8f2 100644
--- a/src/bin/xfrin/tests/xfrin_test.py
+++ b/src/bin/xfrin/tests/xfrin_test.py
@@ -19,6 +19,7 @@ import socket
import io
from isc.testutils.tsigctx_mock import MockTSIGContext
from xfrin import *
+import xfrin
from isc.xfrin.diff import Diff
import isc.log
@@ -2178,6 +2179,128 @@ class TestMain(unittest.TestCase):
MockXfrin.check_command_hook = raise_exception
main(MockXfrin, False)
+class TestXfrinProcess(unittest.TestCase):
+ """
+ Some tests for the xfrin_process function. This replaces the
+ XfrinConnection class with itself, so we can emulate whatever behavior we
+ might want.
+
+ Currently only tests for retry if IXFR fails.
+ """
+ def setUp(self):
+ """
+ Backs up the original class implementation so it can be restored
+ and places our own version in place of the constructor.
+
+ Also sets up several internal variables to watch what happens.
+ """
+ self.__old_conn = xfrin.XfrinConnection
+ xfrin.XfrinConnection = self.__get_connection
+ # This will hold a "log" of what transfers were attempted.
+ self.__transfers = []
+ # This will "log" if failures or successes happened.
+ self.__published = []
+ # How many connections were created.
+ self.__created_connections = 0
+
+ def tearDown(self):
+ """
+ This restores the original version of the class.
+ """
+ xfrin.XfrinConnection = self.__old_conn
+
+ def __get_connection(self, *args):
+ """
+ Provides a "connection". To mock the connection and see what it is
+ asked to do, we pretend to be the connection.
+ """
+ self.__created_connections += 1
+ return self
+
+ def connect_to_master(self):
+ """
+ Part of pretending to be the connection. It pretends it connected
+ correctly every time.
+ """
+ return True
+
+ def do_xfrin(self, check_soa, request_type):
+ """
+ Part of pretending to be the connection. It looks what answer should
+ be answered now and logs what request happened.
+ """
+ self.__transfers.append(request_type)
+ ret = self.__rets[0]
+ self.__rets = self.__rets[1:]
+ return ret
+
+ def zone_str(self):
+ """
+ Part of pretending to be the connection. It provides the logging name
+ of zone.
+ """
+ return "example.org/IN"
+
+ def publish_xfrin_news(self, zone_name, rrclass, ret):
+ """
+ Part of pretending to be the server as well. This just logs the
+ success/failure of the previous operation.
+ """
+ self.__published.append(ret)
+
+ def __do_test(self, rets, transfers, request_type):
+ """
+ Do the actual test. The request type, prepared sucesses/failures
+ and expected sequence of transfers is passed to specify what test
+ should happen.
+ """
+ self.__rets = rets
+ published = rets[-1]
+ xfrin.process_xfrin(self, XfrinRecorder(), Name("example.org."),
+ RRClass.IN(), None, None, None, True, None,
+ request_type)
+ self.assertEqual([], self.__rets)
+ self.assertEqual(transfers, self.__transfers)
+ # Create a connection for each attempt
+ self.assertEqual(len(transfers), self.__created_connections)
+ self.assertEqual([published], self.__published)
+
+ def test_ixfr_ok(self):
+ """
+ Everything OK the first time, over IXFR.
+ """
+ self.__do_test([XFRIN_OK], [RRType.IXFR()], RRType.IXFR())
+
+ def test_axfr_ok(self):
+ """
+ Everything OK the first time, over AXFR.
+ """
+ self.__do_test([XFRIN_OK], [RRType.AXFR()], RRType.AXFR())
+
+ def test_axfr_fail(self):
+ """
+ The transfer failed over AXFR. Should not be retried (we don't expect
+ to fail on AXFR, but succeed on IXFR and we didn't use IXFR in the first
+ place for some reason.
+ """
+ self.__do_test([XFRIN_FAIL], [RRType.AXFR()], RRType.AXFR())
+
+ def test_ixfr_fallback(self):
+ """
+ The transfer fails over IXFR, but suceeds over AXFR. It should fall back
+ to it and say everything is OK.
+ """
+ self.__do_test([XFRIN_FAIL, XFRIN_OK], [RRType.IXFR(), RRType.AXFR()],
+ RRType.IXFR())
+
+ def test_ixfr_fail(self):
+ """
+ The transfer fails both over IXFR and AXFR. It should report failure
+ (only once) and should try both before giving up.
+ """
+ self.__do_test([XFRIN_FAIL, XFRIN_FAIL],
+ [RRType.IXFR(), RRType.AXFR()], RRType.IXFR())
+
if __name__== "__main__":
try:
isc.log.resetUnitTestRootLogger()
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 1f5d9a1..e93a1cb 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -820,14 +820,25 @@ def process_xfrin(server, xfrin_recorder, zone_name, rrclass, db_file,
# Create a TCP connection for the XFR session and perform the operation.
sock_map = {}
- conn = XfrinConnection(sock_map, zone_name, rrclass, datasrc_client,
- shutdown_event, master_addrinfo, tsig_key)
- # XXX: We still need _db_file for temporary workaround in _create_query().
- # This should be removed when we eliminate the need for the workaround.
- conn._db_file = db_file
- ret = XFRIN_FAIL
- if conn.connect_to_master():
- ret = conn.do_xfrin(check_soa, request_type)
+ retry = True
+ while retry:
+ retry = False
+ conn = XfrinConnection(sock_map, zone_name, rrclass, datasrc_client,
+ shutdown_event, master_addrinfo, tsig_key)
+ # XXX: We still need _db_file for temporary workaround in _create_query().
+ # This should be removed when we eliminate the need for the workaround.
+ conn._db_file = db_file
+ ret = XFRIN_FAIL
+ if conn.connect_to_master():
+ ret = conn.do_xfrin(check_soa, request_type)
+ if ret == XFRIN_FAIL and request_type == RRType.IXFR():
+ # IXFR failed for some reason. It might mean the server can't
+ # handle it, or we don't have the zone or we are out of sync or
+ # whatever else. So we retry with with AXFR, as it may succeed
+ # in manu such cases.
+ retry = True
+ request_type = RRType.AXFR()
+ logger.warn(XFRIN_XFR_TRANSFER_FALLBACK, conn.zone_str())
# Publish the zone transfer result news, so zonemgr can reset the
# zone timer, and xfrout can notify the zone's slaves if the result
diff --git a/src/bin/xfrin/xfrin_messages.mes b/src/bin/xfrin/xfrin_messages.mes
index e5d1733..62da890 100644
--- a/src/bin/xfrin/xfrin_messages.mes
+++ b/src/bin/xfrin/xfrin_messages.mes
@@ -29,6 +29,12 @@ this can only happen for AXFR.
The XFR transfer for the given zone has failed due to a protocol error.
The error is shown in the log message.
+% XFRIN_XFR_TRANSFER_FALLBACK falling back from IXFR to AXFR for %1
+The IXFR transfer of the given zone failed. This might happen in many cases,
+such that the remote server doesn't support IXFR, we don't have the SOA record
+(or the zone at all), we are out of sync, etc. In many of these situations,
+AXFR could still work. Therefore we try that one in case it helps.
+
% XFRIN_XFR_TRANSFER_STARTED %1 transfer of zone %2 started
A connection to the master server has been made, the serial value in
the SOA record has been checked, and a zone transfer has been started.
More information about the bind10-changes
mailing list