BIND 10 master, updated. 26b0ae80ecf50d3868ca059a5965ecb275bb135b Merge branch 'trac2856'
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Aug 2 08:33:57 UTC 2013
The branch, master has been updated
via 26b0ae80ecf50d3868ca059a5965ecb275bb135b (commit)
via e3e92f0134210e040c537753fb32e36679f4b1b0 (commit)
via 786a742bc321666586ee923cf15e2d2624ddee42 (commit)
via 4f96d3ab2e65356e9cb778ba140a9b8793f8e879 (commit)
via 77e3dfce7c96bc924de4f1ca7060287c147e53e5 (commit)
via 724e39ef6eaba76229a8208d2bf33449f16f3c01 (commit)
via 941c1d8bfc0468b585039c92eba3165e20f6d08d (commit)
via 40471d97b2dbe22189147f2f46f5956c587fa34f (commit)
via 1f09795960479dcbe6e53ae9ead9f969c0705107 (commit)
via cd9d3e1a07cba7cabf1118ffec7f7dacebc0ecfe (commit)
via 9c54e830d9f3b18232de8304edc490f08ceb4f0e (commit)
via 27a4c2199989c2802b0a5002000c32e6c4e00220 (commit)
via e61c29836e74f2fa7b0767b44d274ee36e8dd6ea (commit)
via 7c6999a010297cde490304a97570aa48e88b2099 (commit)
via 37753c0dc215875538463720a5bdd68afdb4fc4e (commit)
via cca0075f103ef62c5b8413bb19a90c03d7bd4e04 (commit)
via 377e88195e5f86ad60bf02bf02dcbd202daa9fa0 (commit)
via d9b56777aaa3a4e70c9b80ecde1b69aab30cb0ee (commit)
via 7027266480db82481529f3680c506a23289ea460 (commit)
via 2de17f71bab2fe5b02ca8563477441dc2805661c (commit)
via 644a03f0da719b01456ea0115cc0bd661ff9e636 (commit)
via 89a447a134798d2d59ae7a5565a9f07271ed6e9e (commit)
via 292f28a54f954f44b4771f359c9a3cc4753da22a (commit)
via 1bbc1906476bee5320eee4acb954af7b47c2b2d6 (commit)
via af62ea00182e18f2bfa448870ca37490eb830f09 (commit)
via a84352bebaacb3f414e5a01b1b25a3c7d3e50bbf (commit)
via d4fba54ddee752b447164bbed089735f2999f28b (commit)
via fd38783ce713c1ee718805cd5cc7bd33b07dbc4c (commit)
via d474c8d06214a2ef3dfc991dbd7b73dbfa6572b8 (commit)
via e7855781ad5d287d91c883143bbe2552bcc29f8d (commit)
via 59c4a138d18a6fb2a0adc0daff488406b6a6ad09 (commit)
via af0db15b1727fb986a5a08819624b231f97999e8 (commit)
via 3401846345cc6654eec63649e6bf1c71261b8b4f (commit)
via e68217dd349bb078aae6029b95e182ed165e7bcf (commit)
via c6e820b3078f39bfc19c40afb1c0294c15c16707 (commit)
via 8df3463968ed8d79144303a9ec82accc7f7302db (commit)
via e29189407016909a302b2c7d4e9fb77f2ffb50e2 (commit)
via 894180b8bfb30d7dfd7619cccffd0a2b4c3d4a2f (commit)
via a06a52e6609159bb97b49169192b19d9657aceff (commit)
from 6606b6d02a352c15fa60f842bef9ccfecab93c41 (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 26b0ae80ecf50d3868ca059a5965ecb275bb135b
Merge: 6606b6d e3e92f0
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri Aug 2 13:54:41 2013 +0530
Merge branch 'trac2856'
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
src/bin/memmgr/memmgr.py.in | 2 +-
src/lib/python/isc/log_messages/Makefile.am | 2 +
.../python/isc/log_messages/libmemmgr_messages.py | 1 +
src/lib/python/isc/memmgr/Makefile.am | 17 +-
src/lib/python/isc/memmgr/builder.py | 112 +++++++-
src/lib/python/isc/memmgr/datasrc_info.py | 201 +++++++++++++-
src/lib/python/isc/memmgr/libmemmgr_messages.mes | 35 +++
.../python/isc/{server_common => memmgr}/logger.py | 6 +-
src/lib/python/isc/memmgr/tests/Makefile.am | 4 +-
src/lib/python/isc/memmgr/tests/builder_tests.py | 131 ++++++++-
.../python/isc/memmgr/tests/datasrc_info_tests.py | 285 +++++++++++++++++++-
.../python/isc/memmgr/tests/testdata/Makefile.am | 2 +
.../tests/testdata/example.com.zone} | 0
14 files changed, 766 insertions(+), 33 deletions(-)
create mode 100644 src/lib/python/isc/log_messages/libmemmgr_messages.py
create mode 100644 src/lib/python/isc/memmgr/libmemmgr_messages.mes
copy src/lib/python/isc/{server_common => memmgr}/logger.py (81%)
create mode 100644 src/lib/python/isc/memmgr/tests/testdata/Makefile.am
copy src/lib/python/isc/{datasrc/tests/testdata/example.com => memmgr/tests/testdata/example.com.zone} (100%)
-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 7c59b5f..609fa8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1295,6 +1295,7 @@ AC_CONFIG_FILES([Makefile
src/lib/python/isc/ddns/tests/Makefile
src/lib/python/isc/memmgr/Makefile
src/lib/python/isc/memmgr/tests/Makefile
+ src/lib/python/isc/memmgr/tests/testdata/Makefile
src/lib/python/isc/xfrin/Makefile
src/lib/python/isc/xfrin/tests/Makefile
src/lib/python/isc/server_common/Makefile
diff --git a/src/bin/memmgr/memmgr.py.in b/src/bin/memmgr/memmgr.py.in
index 5c9040f..4bf27fe 100755
--- a/src/bin/memmgr/memmgr.py.in
+++ b/src/bin/memmgr/memmgr.py.in
@@ -162,7 +162,7 @@ class Memmgr(BIND10Server):
# This makes the MemorySegmentBuilder exit its main loop. It
# should make the builder thread joinable.
with self._builder_cv:
- self._builder_command_queue.append('shutdown')
+ self._builder_command_queue.append(('shutdown',))
self._builder_cv.notify_all()
self._builder_thread.join()
diff --git a/src/lib/python/isc/log_messages/Makefile.am b/src/lib/python/isc/log_messages/Makefile.am
index caf1e3b..3e265d7 100644
--- a/src/lib/python/isc/log_messages/Makefile.am
+++ b/src/lib/python/isc/log_messages/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST = __init__.py
EXTRA_DIST += init_messages.py
EXTRA_DIST += cmdctl_messages.py
EXTRA_DIST += ddns_messages.py
+EXTRA_DIST += libmemmgr_messages.py
EXTRA_DIST += memmgr_messages.py
EXTRA_DIST += stats_messages.py
EXTRA_DIST += stats_httpd_messages.py
@@ -25,6 +26,7 @@ CLEANFILES = __init__.pyc
CLEANFILES += init_messages.pyc
CLEANFILES += cmdctl_messages.pyc
CLEANFILES += ddns_messages.pyc
+CLEANFILES += libmemmgr_messages.pyc
CLEANFILES += memmgr_messages.pyc
CLEANFILES += stats_messages.pyc
CLEANFILES += stats_httpd_messages.pyc
diff --git a/src/lib/python/isc/log_messages/libmemmgr_messages.py b/src/lib/python/isc/log_messages/libmemmgr_messages.py
new file mode 100644
index 0000000..3aedc3f
--- /dev/null
+++ b/src/lib/python/isc/log_messages/libmemmgr_messages.py
@@ -0,0 +1 @@
+from work.libmemmgr_messages import *
diff --git a/src/lib/python/isc/memmgr/Makefile.am b/src/lib/python/isc/memmgr/Makefile.am
index f00dba6..5529570 100644
--- a/src/lib/python/isc/memmgr/Makefile.am
+++ b/src/lib/python/isc/memmgr/Makefile.am
@@ -1,9 +1,24 @@
SUBDIRS = . tests
-python_PYTHON = __init__.py builder.py datasrc_info.py
+python_PYTHON = __init__.py builder.py datasrc_info.py logger.py
pythondir = $(pyexecdir)/isc/memmgr
+BUILT_SOURCES = $(PYTHON_LOGMSGPKG_DIR)/work/libmemmgr_messages.py
+
+nodist_pylogmessage_PYTHON = $(PYTHON_LOGMSGPKG_DIR)/work/libmemmgr_messages.py
+
+pylogmessagedir = $(pyexecdir)/isc/log_messages/
+
+CLEANFILES = $(PYTHON_LOGMSGPKG_DIR)/work/libmemmgr_messages.py
+CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/libmemmgr_messages.pyc
+
+EXTRA_DIST = libmemmgr_messages.mes
+
+$(PYTHON_LOGMSGPKG_DIR)/work/libmemmgr_messages.py : libmemmgr_messages.mes
+ $(top_builddir)/src/lib/log/compiler/message \
+ -d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/libmemmgr_messages.mes
+
CLEANDIRS = __pycache__
clean-local:
diff --git a/src/lib/python/isc/memmgr/builder.py b/src/lib/python/isc/memmgr/builder.py
index 5b4eed9..9c3738e 100644
--- a/src/lib/python/isc/memmgr/builder.py
+++ b/src/lib/python/isc/memmgr/builder.py
@@ -13,6 +13,13 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+import json
+from isc.datasrc import ConfigurableClientList
+from isc.memmgr.datasrc_info import SegmentInfo
+
+from isc.log_messages.libmemmgr_messages import *
+from isc.memmgr.logger import logger
+
class MemorySegmentBuilder:
"""The builder runs in a different thread in the memory manager. It
waits for commands from the memory manager, and then executes them
@@ -50,6 +57,83 @@ class MemorySegmentBuilder:
self._response_queue = response_queue
self._shutdown = False
+ def __handle_shutdown(self):
+ # This method is called when handling the 'shutdown' command. The
+ # following tuple is passed:
+ #
+ # ('shutdown',)
+ self._shutdown = True
+
+ def __handle_bad_command(self, bad_command):
+ # A bad command was received. Raising an exception is not useful
+ # in this case as we are likely running in a different thread
+ # from the main thread which would need to be notified. Instead
+ # return this in the response queue.
+ logger.error(LIBMEMMGR_BUILDER_BAD_COMMAND_ERROR, bad_command)
+ self._response_queue.append(('bad_command',))
+ self._shutdown = True
+
+ def __handle_load(self, zone_name, dsrc_info, rrclass, dsrc_name):
+ # This method is called when handling the 'load' command. The
+ # following tuple is passed:
+ #
+ # ('load', zone_name, dsrc_info, rrclass, dsrc_name)
+ #
+ # where:
+ #
+ # * zone_name is None or isc.dns.Name, specifying the zone name
+ # to load. If it's None, it means all zones to be cached in
+ # the specified data source (used for initialization).
+ #
+ # * dsrc_info is a DataSrcInfo object corresponding to the
+ # generation ID of the set of data sources for this loading.
+ #
+ # * rrclass is an isc.dns.RRClass object, the RR class of the
+ # data source.
+ #
+ # * dsrc_name is a string, specifying a data source name.
+
+ clist = dsrc_info.clients_map[rrclass]
+ sgmt_info = dsrc_info.segment_info_map[(rrclass, dsrc_name)]
+ params = json.dumps(sgmt_info.get_reset_param(SegmentInfo.WRITER))
+ clist.reset_memory_segment(dsrc_name,
+ ConfigurableClientList.READ_WRITE,
+ params)
+
+ if zone_name is not None:
+ zones = [(None, zone_name)]
+ else:
+ zones = clist.get_zone_table_accessor(dsrc_name, True)
+
+ for _, zone_name in zones:
+ catch_load_error = (zone_name is None) # install empty zone initially
+ result, writer = clist.get_cached_zone_writer(zone_name, catch_load_error,
+ dsrc_name)
+ if result != ConfigurableClientList.CACHE_STATUS_ZONE_SUCCESS:
+ logger.error(LIBMEMMGR_BUILDER_GET_ZONE_WRITER_ERROR, zone_name, dsrc_name)
+ continue
+
+ try:
+ error = writer.load()
+ if error is not None:
+ logger.error(LIBMEMMGR_BUILDER_ZONE_WRITER_LOAD_1_ERROR, zone_name, dsrc_name, error)
+ continue
+ except Exception as e:
+ logger.error(LIBMEMMGR_BUILDER_ZONE_WRITER_LOAD_2_ERROR, zone_name, dsrc_name, str(e))
+ continue
+ writer.install()
+ writer.cleanup()
+
+ # need to reset the segment so readers can read it (note: memmgr
+ # itself doesn't have to keep it open, but there's currently no
+ # public API to just clear the segment)
+ clist.reset_memory_segment(dsrc_name,
+ ConfigurableClientList.READ_ONLY,
+ params)
+
+ self._response_queue.append(('load-completed', dsrc_info, rrclass,
+ dsrc_name))
+
def run(self):
""" This is the method invoked when the builder thread is
started. In this thread, be careful when modifying
@@ -64,7 +148,7 @@ class MemorySegmentBuilder:
# Acquire the condition variable while running the loop.
with self._cv:
while not self._shutdown:
- while len(self._command_queue) == 0:
+ while not self._command_queue:
self._cv.wait()
# Move the queue content to a local queue. Be careful of
# not making assignments to reference variables.
@@ -74,26 +158,28 @@ class MemorySegmentBuilder:
# Run commands passed in the command queue sequentially
# in the given order. For now, it only supports the
# "shutdown" command, which just exits the thread.
- for command in local_command_queue:
- if command == 'shutdown':
- self._shutdown = True
+ for command_tuple in local_command_queue:
+ command = command_tuple[0]
+ if command == 'load':
+ # See the comments for __handle_load() for
+ # details of the tuple passed to the "load"
+ # command.
+ _, zone_name, dsrc_info, rrclass, dsrc_name = command_tuple
+ self.__handle_load(zone_name, dsrc_info, rrclass, dsrc_name)
+ elif command == 'shutdown':
+ self.__handle_shutdown()
# When the shutdown command is received, we do
# not process any further commands.
break
else:
- # A bad command was received. Raising an
- # exception is not useful in this case as we are
- # likely running in a different thread from the
- # main thread which would need to be
- # notified. Instead return this in the response
- # queue.
- self._response_queue.append(('bad_command',))
- self._shutdown = True
+ self.__handle_bad_command(command)
+ # When a bad command is received, we do not
+ # process any further commands.
break
# Notify (any main thread) on the socket about a
# response. Otherwise, the main thread may wait in its
# loop without knowing there was a problem.
- if len(self._response_queue) > 0:
+ if self._response_queue:
while self._sock.send(b'x') != 1:
continue
diff --git a/src/lib/python/isc/memmgr/datasrc_info.py b/src/lib/python/isc/memmgr/datasrc_info.py
index 86f2d6a..db4a515 100644
--- a/src/lib/python/isc/memmgr/datasrc_info.py
+++ b/src/lib/python/isc/memmgr/datasrc_info.py
@@ -14,6 +14,7 @@
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
import os
+from collections import deque
class SegmentInfoError(Exception):
"""An exception raised for general errors in the SegmentInfo class."""
@@ -33,16 +34,208 @@ class SegmentInfo:
segment-type specific details. Such details are expected to be
delegated to subclasses corresponding to specific types of segments.
- The implementation is still incomplete. It will have more attributes
- such as a set of current readers, methods for adding or deleting
- the readers. These will probably be implemented in this base class
- as they will be independent from segment-type specific details.
+ A summarized (and simplified) state transition diagram (for __state)
+ would be as follows:
+ +--sync_reader()/remove_reader()
+ | still have old readers
+ | |
+ UPDATING-----complete_--->SYNCHRONIZING<---+
+ ^ update() |
+ start_update()| | sync_reader()/remove_reader()
+ events | V no more old reader
+ exist READY<------complete_----------COPYING
+ update()
"""
# Common constants of user type: reader or writer
READER = 0
WRITER = 1
+ # Enumerated values for state:
+ UPDATING = 0 # the segment is being updated (by the builder thread,
+ # although SegmentInfo won't care about this level of
+ # details).
+ SYNCHRONIZING = 1 # one pair of underlying segments has been
+ # updated, and readers are now migrating to the
+ # updated version of the segment.
+ COPYING = 2 # all readers that used the old version of segment have
+ # been migrated to the updated version, and the old
+ # segment is now being updated.
+ READY = 3 # both segments of the pair have been updated. it can now
+ # handle further updates (e.g., from xfrin).
+
+ def __init__(self):
+ # Holds the state of SegmentInfo. See the class description
+ # above for the state transition diagram.
+ self.__state = self.READY
+ # __readers is a set of 'reader_session_id' private to
+ # SegmentInfo. It consists of the (ID of) reader modules that
+ # are using the "current" reader version of the segment.
+ self.__readers = set()
+ # __old_readers is a set of 'reader_session_id' private to
+ # SegmentInfo for write (update), but publicly readable. It can
+ # be non empty only in the SYNCHRONIZING state, and consists of
+ # (ID of) reader modules that are using the old version of the
+ # segments (and have to migrate to the updated version).
+ self.__old_readers = set()
+ # __events is a FIFO queue of opaque data for pending update
+ # events. Update events can come at any time (e.g., after
+ # xfr-in), but can be only handled if SegmentInfo is in the
+ # READY state. This maintains such pending events in the order
+ # they arrived. SegmentInfo doesn't have to know the details of
+ # the stored data; it only matters for the memmgr.
+ self.__events = deque()
+
+ def get_state(self):
+ """Returns the state of SegmentInfo (UPDATING, SYNCHRONIZING,
+ COPYING or READY)."""
+ return self.__state
+
+ def get_readers(self):
+ """Returns a set of IDs of the reader modules that are using the
+ "current" reader version of the segment. This method is mainly
+ useful for testing purposes."""
+ return self.__readers
+
+ def get_old_readers(self):
+ """Returns a set of IDs of reader modules that are using the old
+ version of the segments and have to be migrated to the updated
+ version."""
+ return self.__old_readers
+
+ def get_events(self):
+ """Returns a list of pending events in the order they arrived."""
+ return list(self.__events)
+
+ # Helper method used in complete_update(), sync_reader() and
+ # remove_reader().
+ def __sync_reader_helper(self, new_state):
+ if not self.__old_readers:
+ self.__state = new_state
+ if self.__events:
+ return self.__events.popleft()
+
+ return None
+
+ def add_event(self, event_data):
+ """Add an event to the end of the pending events queue. The
+ event_data is not used internally by this class, and is returned
+ as-is by other methods. The format of event_data only matters in
+ the memmgr. This method must be called by memmgr when it
+ receives a request for reloading a zone. No state transition
+ happens."""
+ self.__events.append(event_data)
+
+ def add_reader(self, reader_session_id):
+ """Add the reader module ID to an internal set of reader modules
+ that are using the "current" reader version of the segment. It
+ must be called by memmgr when it first gets the pre-existing
+ readers or when it's notified of a new reader. No state
+ transition happens.
+
+ When the SegmentInfo is not in the READY state, if memmgr gets
+ notified of a new reader (such as b10-auth) subscribing to the
+ readers group and calls add_reader(), we assume the new reader
+ is using the new mapped file and not the old one. For making
+ sure there is no race, memmgr should make SegmentInfo updates in
+ the main thread itself (which also handles communications) and
+ only have the builder in a different thread."""
+ if reader_session_id in self.__readers:
+ raise SegmentInfoError('Reader session ID is already in readers set: ' +
+ str(reader_session_id))
+
+ self.__readers.add(reader_session_id)
+
+ def start_update(self):
+ """If the current state is READY and there are pending events,
+ it changes the state to UPDATING and returns the head (oldest)
+ event (without removing it from the pending events queue). This
+ tells the caller (memmgr) that it should initiate the update
+ process with the builder. In all other cases it returns None."""
+ if self.__state == self.READY:
+ if self.__events:
+ self.__state = self.UPDATING
+ return self.__events[0]
+ else:
+ return None
+
+ raise SegmentInfoError('start_update() called in ' +
+ 'incorrect state: ' + str(self.__state))
+
+ def complete_update(self):
+ """This method should be called when memmgr is notified by the
+ builder of the completion of segment update. It changes the
+ state from UPDATING to SYNCHRONIZING, and COPYING to READY. In
+ the former case, set of reader modules that are using the
+ "current" reader version of the segment are moved to the set
+ that are using an "old" version of segment. If there are no such
+ readers using the "old" version of segment, it pops the head
+ (oldest) event from the pending events queue and returns it. It
+ is an error if this method is called in other states than
+ UPDATING and COPYING."""
+ if self.__state == self.UPDATING:
+ self.__state = self.SYNCHRONIZING
+ self.__old_readers = self.__readers
+ self.__readers = set()
+ return self.__sync_reader_helper(self.READY)
+ elif self.__state == self.COPYING:
+ self.__state = self.READY
+ return None
+ else:
+ raise SegmentInfoError('complete_update() called in ' +
+ 'incorrect state: ' + str(self.__state))
+
+ def sync_reader(self, reader_session_id):
+ """This method must only be called in the SYNCHRONIZING
+ state. memmgr should call it when it receives the
+ "segment_update_ack" message from a reader module. It moves the
+ given ID from the set of reader modules that are using the "old"
+ version of the segment to the set of reader modules that are
+ using the "current" version of the segment, and if there are no
+ reader modules using the "old" version of the segment, the state
+ is changed to COPYING. If the state has changed to COPYING, it
+ pops the head (oldest) event from the pending events queue and
+ returns it; otherwise it returns None."""
+ if self.__state != self.SYNCHRONIZING:
+ raise SegmentInfoError('sync_reader() called in ' +
+ 'incorrect state: ' + str(self.__state))
+ if reader_session_id not in self.__old_readers:
+ raise SegmentInfoError('Reader session ID is not in old readers set: ' +
+ str(reader_session_id))
+ if reader_session_id in self.__readers:
+ raise SegmentInfoError('Reader session ID is already in readers set: ' +
+ str(reader_session_id))
+
+ self.__old_readers.remove(reader_session_id)
+ self.__readers.add(reader_session_id)
+
+ return self.__sync_reader_helper(self.COPYING)
+
+ def remove_reader(self, reader_session_id):
+ """This method must only be called in the SYNCHRONIZING
+ state. memmgr should call it when it's notified that an existing
+ reader has unsubscribed. It removes the given reader ID from
+ either the set of readers that use the "current" version of the
+ segment or the "old" version of the segment (wherever the reader
+ belonged), and in the latter case, if there are no reader
+ modules using the "old" version of the segment, the state is
+ changed to COPYING. If the state has changed to COPYING, it pops
+ the head (oldest) event from the pending events queue and
+ returns it; otherwise it returns None."""
+ if self.__state != self.SYNCHRONIZING:
+ raise SegmentInfoError('remove_reader() called in ' +
+ 'incorrect state: ' + str(self.__state))
+ if reader_session_id in self.__old_readers:
+ self.__old_readers.remove(reader_session_id)
+ return self.__sync_reader_helper(self.COPYING)
+ elif reader_session_id in self.__readers:
+ self.__readers.remove(reader_session_id)
+ return None
+ else:
+ raise SegmentInfoError('Reader session ID is not in current ' +
+ 'readers or old readers set: ' +
+ str(reader_session_id))
+
def create(type, genid, rrclass, datasrc_name, mgr_config):
"""Factory of specific SegmentInfo subclass instance based on the
segment type.
diff --git a/src/lib/python/isc/memmgr/libmemmgr_messages.mes b/src/lib/python/isc/memmgr/libmemmgr_messages.mes
new file mode 100644
index 0000000..c8fcf05
--- /dev/null
+++ b/src/lib/python/isc/memmgr/libmemmgr_messages.mes
@@ -0,0 +1,35 @@
+# Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+# No namespace declaration - these constants go in the global namespace
+# of the config_messages python module.
+
+% LIBMEMMGR_BUILDER_BAD_COMMAND_ERROR MemorySegmentBuilder received bad command '%1'
+The MemorySegmentBuilder has received a bad command in its input command
+queue. This is likely a programming error. If the builder runs in a
+separate thread, this would cause it to exit the thread.
+
+% LIBMEMMGR_BUILDER_GET_ZONE_WRITER_ERROR Unable to get zone writer for zone '%1', data source '%2'. Skipping.
+The MemorySegmentBuilder was unable to get a ZoneWriter for the
+specified zone when handling the load command. This zone will be
+skipped.
+
+% LIBMEMMGR_BUILDER_ZONE_WRITER_LOAD_1_ERROR Error loading zone '%1', data source '%2': '%3'
+The MemorySegmentBuilder failed to load the specified zone when handling
+the load command. This zone will be skipped.
+
+% LIBMEMMGR_BUILDER_ZONE_WRITER_LOAD_2_ERROR Error loading zone '%1', data source '%2': '%3'
+An exception occured when the MemorySegmentBuilder tried to load the
+specified zone when handling the load command. This zone will be
+skipped.
diff --git a/src/lib/python/isc/memmgr/logger.py b/src/lib/python/isc/memmgr/logger.py
new file mode 100644
index 0000000..eb324cf
--- /dev/null
+++ b/src/lib/python/isc/memmgr/logger.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+'''Common definitions regarding logging for the memmgr package.'''
+
+import isc.log
+
+logger = isc.log.Logger("libmemmgr")
diff --git a/src/lib/python/isc/memmgr/tests/Makefile.am b/src/lib/python/isc/memmgr/tests/Makefile.am
index 7a85083..b171cb1 100644
--- a/src/lib/python/isc/memmgr/tests/Makefile.am
+++ b/src/lib/python/isc/memmgr/tests/Makefile.am
@@ -1,3 +1,4 @@
+SUBDIRS = testdata
PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = builder_tests.py datasrc_info_tests.py
EXTRA_DIST = $(PYTESTS)
@@ -26,7 +27,8 @@ endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
$(LIBRARY_PATH_PLACEHOLDER) \
- TESTDATA_PATH=$(builddir) \
+ TESTDATA_PATH=$(abs_srcdir)/testdata \
+ TESTDATA_WRITE_PATH=$(builddir) \
B10_FROM_BUILD=$(abs_top_builddir) \
HAVE_SHARED_MEMORY=$(HAVE_SHARED_MEMORY) \
PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/lib/dns/python/.libs \
diff --git a/src/lib/python/isc/memmgr/tests/builder_tests.py b/src/lib/python/isc/memmgr/tests/builder_tests.py
index 328fd74..b5122cb 100644
--- a/src/lib/python/isc/memmgr/tests/builder_tests.py
+++ b/src/lib/python/isc/memmgr/tests/builder_tests.py
@@ -14,12 +14,28 @@
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
import unittest
+import os
import socket
import select
import threading
import isc.log
+from isc.dns import *
+import isc.datasrc
from isc.memmgr.builder import *
+from isc.server_common.datasrc_clients_mgr import DataSrcClientsMgr
+from isc.memmgr.datasrc_info import *
+
+TESTDATA_PATH = os.environ['TESTDATA_PATH'] + os.sep
+
+# Defined for easier tests with DataSrcClientsMgr.reconfigure(), which
+# only needs get_value() method
+class MockConfigData:
+ def __init__(self, data):
+ self.__data = data
+
+ def get_value(self, identifier):
+ return self.__data[identifier], False
class TestMemorySegmentBuilder(unittest.TestCase):
def _create_builder_thread(self):
@@ -29,7 +45,8 @@ class TestMemorySegmentBuilder(unittest.TestCase):
self._builder_command_queue = []
self._builder_response_queue = []
- self._builder_cv = threading.Condition()
+ self._builder_lock = threading.Lock()
+ self._builder_cv = threading.Condition(lock=self._builder_lock)
self._builder = MemorySegmentBuilder(self._builder_sock,
self._builder_cv,
@@ -39,6 +56,7 @@ class TestMemorySegmentBuilder(unittest.TestCase):
def setUp(self):
self._create_builder_thread()
+ self.__mapped_file_path = None
def tearDown(self):
# It's the tests' responsibility to stop and join the builder
@@ -48,6 +66,10 @@ class TestMemorySegmentBuilder(unittest.TestCase):
self._master_sock.close()
self._builder_sock.close()
+ if self.__mapped_file_path is not None:
+ if os.path.exists(self.__mapped_file_path):
+ os.unlink(self.__mapped_file_path)
+
def test_bad_command(self):
"""Tests what happens when a bad command is passed to the
MemorySegmentBuilder.
@@ -58,7 +80,7 @@ class TestMemorySegmentBuilder(unittest.TestCase):
# Now that the builder thread is running, send it a bad
# command. The thread should exit its main loop and be joinable.
with self._builder_cv:
- self._builder_command_queue.append('bad_command')
+ self._builder_command_queue.append(('bad_command',))
self._builder_cv.notify_all()
# Wait 5 seconds to receive a notification on the socket from
@@ -95,13 +117,110 @@ class TestMemorySegmentBuilder(unittest.TestCase):
self._builder_thread.start()
- # Now that the builder thread is running, send it the shutdown
+ # Now that the builder thread is running, send it the "shutdown"
# command. The thread should exit its main loop and be joinable.
with self._builder_cv:
- self._builder_command_queue.append('shutdown')
+ self._builder_command_queue.append(('shutdown',))
# Commands after 'shutdown' must be ignored.
- self._builder_command_queue.append('bad_command_1')
- self._builder_command_queue.append('bad_command_2')
+ self._builder_command_queue.append(('bad_command_1',))
+ self._builder_command_queue.append(('bad_command_2',))
+ self._builder_cv.notify_all()
+
+ # Wait 5 seconds at most for the main loop of the builder to
+ # exit.
+ self._builder_thread.join(5)
+ self.assertFalse(self._builder_thread.isAlive())
+
+ # The command queue must be cleared, and the response queue must
+ # be untouched (we don't use it in this test). The thread is no
+ # longer running, so we can use the queues without a lock.
+ self.assertEqual(len(self._builder_command_queue), 0)
+ self.assertEqual(len(self._builder_response_queue), 0)
+
+ @unittest.skipIf(os.environ['HAVE_SHARED_MEMORY'] != 'yes',
+ 'shared memory is not available')
+ def test_load(self):
+ """
+ Test "load" command.
+ """
+
+ mapped_file_dir = os.environ['TESTDATA_WRITE_PATH']
+ mgr_config = {'mapped_file_dir': mapped_file_dir}
+
+ cfg_data = MockConfigData(
+ {"classes":
+ {"IN": [{"type": "MasterFiles",
+ "params": { "example.com": TESTDATA_PATH + "example.com.zone" },
+ "cache-enable": True,
+ "cache-type": "mapped"}]
+ }
+ })
+ cmgr = DataSrcClientsMgr(use_cache=True)
+ cmgr.reconfigure({}, cfg_data)
+
+ genid, clients_map = cmgr.get_clients_map()
+ datasrc_info = DataSrcInfo(genid, clients_map, mgr_config)
+
+ self.assertEqual(1, datasrc_info.gen_id)
+ self.assertEqual(clients_map, datasrc_info.clients_map)
+ self.assertEqual(1, len(datasrc_info.segment_info_map))
+ sgmt_info = datasrc_info.segment_info_map[(RRClass.IN, 'MasterFiles')]
+ self.assertIsNone(sgmt_info.get_reset_param(SegmentInfo.READER))
+ self.assertIsNotNone(sgmt_info.get_reset_param(SegmentInfo.WRITER))
+
+ param = sgmt_info.get_reset_param(SegmentInfo.WRITER)
+ self.__mapped_file_path = param['mapped-file']
+
+ self._builder_thread.start()
+
+ # Now that the builder thread is running, send it the "load"
+ # command. We should be notified when the load operation is
+ # complete.
+ with self._builder_cv:
+ self._builder_command_queue.append(('load',
+ isc.dns.Name("example.com"),
+ datasrc_info, RRClass.IN,
+ 'MasterFiles'))
+ self._builder_cv.notify_all()
+
+ # Wait 60 seconds to receive a notification on the socket from
+ # the builder.
+ (reads, _, _) = select.select([self._master_sock], [], [], 60)
+ self.assertTrue(self._master_sock in reads)
+
+ # Reading 1 byte should not block us here, especially as the
+ # socket is ready to read. It's a hack, but this is just a
+ # testcase.
+ got = self._master_sock.recv(1)
+ self.assertEqual(got, b'x')
+
+ with self._builder_lock:
+ # The command queue must be cleared, and the response queue
+ # must contain a response that a bad command was sent. The
+ # thread is no longer running, so we can use the queues
+ # without a lock.
+ self.assertEqual(len(self._builder_command_queue), 0)
+ self.assertEqual(len(self._builder_response_queue), 1)
+
+ response = self._builder_response_queue[0]
+ self.assertTrue(isinstance(response, tuple))
+ self.assertTupleEqual(response, ('load-completed', datasrc_info,
+ RRClass.IN, 'MasterFiles'))
+ del self._builder_response_queue[:]
+
+ # Now try looking for some loaded data
+ clist = datasrc_info.clients_map[RRClass.IN]
+ dsrc, finder, exact = clist.find(isc.dns.Name("example.com"))
+ self.assertIsNotNone(dsrc)
+ self.assertTrue(isinstance(dsrc, isc.datasrc.DataSourceClient))
+ self.assertIsNotNone(finder)
+ self.assertTrue(isinstance(finder, isc.datasrc.ZoneFinder))
+ self.assertTrue(exact)
+
+ # Send the builder thread the "shutdown" command. The thread
+ # should exit its main loop and be joinable.
+ with self._builder_cv:
+ self._builder_command_queue.append(('shutdown',))
self._builder_cv.notify_all()
# Wait 5 seconds at most for the main loop of the builder to
diff --git a/src/lib/python/isc/memmgr/tests/datasrc_info_tests.py b/src/lib/python/isc/memmgr/tests/datasrc_info_tests.py
index cc6307f..538f375 100644
--- a/src/lib/python/isc/memmgr/tests/datasrc_info_tests.py
+++ b/src/lib/python/isc/memmgr/tests/datasrc_info_tests.py
@@ -34,7 +34,7 @@ class MockConfigData:
class TestSegmentInfo(unittest.TestCase):
def setUp(self):
- self.__mapped_file_dir = os.environ['TESTDATA_PATH']
+ self.__mapped_file_dir = os.environ['TESTDATA_WRITE_PATH']
self.__sgmt_info = SegmentInfo.create('mapped', 0, RRClass.IN,
'sqlite3',
{'mapped_file_dir':
@@ -60,7 +60,284 @@ class TestSegmentInfo(unittest.TestCase):
self.__check_sgmt_reset_param(SegmentInfo.WRITER, 0)
self.__check_sgmt_reset_param(SegmentInfo.READER, None)
- def test_swtich_versions(self):
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+ self.assertEqual(len(self.__sgmt_info.get_readers()), 0)
+ self.assertEqual(len(self.__sgmt_info.get_old_readers()), 0)
+ self.assertEqual(len(self.__sgmt_info.get_events()), 0)
+
+ def __si_to_ready_state(self):
+ # Go to a default starting state
+ self.__sgmt_info = SegmentInfo.create('mapped', 0, RRClass.IN,
+ 'sqlite3',
+ {'mapped_file_dir':
+ self.__mapped_file_dir})
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+ def __si_to_updating_state(self):
+ self.__si_to_ready_state()
+ self.__sgmt_info.add_reader(3)
+ self.__sgmt_info.add_event((42,))
+ e = self.__sgmt_info.start_update()
+ self.assertTupleEqual(e, (42,))
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {3})
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.UPDATING)
+
+ def __si_to_synchronizing_state(self):
+ self.__si_to_updating_state()
+ self.__sgmt_info.complete_update()
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ def __si_to_copying_state(self):
+ self.__si_to_synchronizing_state()
+ self.__sgmt_info.sync_reader(3)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.COPYING)
+
+ def test_add_event(self):
+ self.assertEqual(len(self.__sgmt_info.get_events()), 0)
+ self.__sgmt_info.add_event(None)
+ self.assertEqual(len(self.__sgmt_info.get_events()), 1)
+ self.assertListEqual(self.__sgmt_info.get_events(), [None])
+
+ def test_add_reader(self):
+ self.assertSetEqual(self.__sgmt_info.get_readers(), set())
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), set())
+ self.__sgmt_info.add_reader(1)
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {1})
+ self.__sgmt_info.add_reader(3)
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {1, 3})
+ self.__sgmt_info.add_reader(2)
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {1, 2, 3})
+
+ # adding the same existing reader must throw
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.add_reader, (1))
+ # but the existing readers must be untouched
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {1, 3, 2})
+
+ # none of this touches the old readers
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), set())
+
+ def test_start_update(self):
+ # in READY state
+ # a) there are no events
+ self.__si_to_ready_state()
+ e = self.__sgmt_info.start_update()
+ self.assertIsNone(e)
+ # if there are no events, there is nothing to update
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+ # b) there are events. this is the same as calling
+ # self.__si_to_updating_state(), but let's try to be
+ # descriptive.
+ self.__si_to_ready_state()
+ self.__sgmt_info.add_event((42,))
+ e = self.__sgmt_info.start_update()
+ self.assertTupleEqual(e, (42,))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.UPDATING)
+
+ # in UPDATING state, it should always raise an exception and not
+ # change state.
+ self.__si_to_updating_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.start_update)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.UPDATING)
+
+ # in SYNCHRONIZING state, it should always raise an exception
+ # and not change state.
+ self.__si_to_synchronizing_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.start_update)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ # in COPYING state, it should always raise an exception and not
+ # change state.
+ self.__si_to_copying_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.start_update)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.COPYING)
+
+ def test_complete_update(self):
+ # in READY state
+ self.__si_to_ready_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.complete_update)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+ # in UPDATING state this is the same as calling
+ # self.__si_to_synchronizing_state(), but let's try to be
+ # descriptive.
+ #
+ # a) with no events
+ self.__si_to_updating_state()
+ e = self.__sgmt_info.complete_update()
+ self.assertIsNone(e)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ # b) with events
+ self.__si_to_updating_state()
+ self.__sgmt_info.add_event((81,))
+ e = self.__sgmt_info.complete_update()
+ self.assertIsNone(e) # old_readers is not empty
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ # c) with no readers, complete_update() from UPDATING must go
+ # directly to READY state
+ self.__si_to_ready_state()
+ self.__sgmt_info.add_event((42,))
+ e = self.__sgmt_info.start_update()
+ self.assertTupleEqual(e, (42,))
+ self.assertSetEqual(self.__sgmt_info.get_readers(), set())
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.UPDATING)
+ e = self.__sgmt_info.complete_update()
+ self.assertTupleEqual(e, (42,))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+ # in SYNCHRONIZING state
+ self.__si_to_synchronizing_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.complete_update)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ # in COPYING state
+ self.__si_to_copying_state()
+ e = self.__sgmt_info.complete_update()
+ self.assertIsNone(e)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+ def test_sync_reader(self):
+ # in READY state, it must raise an exception
+ self.__si_to_ready_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (0))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+ # in UPDATING state, it must raise an exception
+ self.__si_to_updating_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (0))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.UPDATING)
+
+ # in COPYING state, it must raise an exception
+ self.__si_to_copying_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (0))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.COPYING)
+
+ # in SYNCHRONIZING state:
+ #
+ # a) ID is not in old readers set. The following call sets up ID 3
+ # to be in the old readers set.
+ self.__si_to_synchronizing_state()
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), set())
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (1))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ # b) ID is in old readers set, but also in readers set.
+ self.__si_to_synchronizing_state()
+ self.__sgmt_info.add_reader(3)
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {3})
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (3))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ # c) ID is in old readers set, but not in readers set, and
+ # old_readers becomes empty.
+ self.__si_to_synchronizing_state()
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), set())
+ self.assertListEqual(self.__sgmt_info.get_events(), [(42,)])
+ e = self.__sgmt_info.sync_reader(3)
+ self.assertTupleEqual(e, (42,))
+ # the ID should be moved from old readers to readers set
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), set())
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {3})
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.COPYING)
+
+ # d) ID is in old readers set, but not in readers set, and
+ # old_readers doesn't become empty.
+ self.__si_to_updating_state()
+ self.__sgmt_info.add_reader(4)
+ self.__sgmt_info.complete_update()
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3, 4})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), set())
+ self.assertListEqual(self.__sgmt_info.get_events(), [(42,)])
+ e = self.__sgmt_info.sync_reader(3)
+ self.assertIsNone(e)
+ # the ID should be moved from old readers to readers set
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {4})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {3})
+ # we should be left in SYNCHRONIZING state
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ def test_remove_reader(self):
+ # in READY state, it must raise an exception
+ self.__si_to_ready_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.remove_reader, (0))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+ # in UPDATING state, it must raise an exception
+ self.__si_to_updating_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.remove_reader, (0))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.UPDATING)
+
+ # in COPYING state, it must raise an exception
+ self.__si_to_copying_state()
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.remove_reader, (0))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.COPYING)
+
+ # in SYNCHRONIZING state:
+ #
+ # a) ID is not in old readers set or readers set.
+ self.__si_to_synchronizing_state()
+ self.__sgmt_info.add_reader(4)
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {4})
+ self.assertListEqual(self.__sgmt_info.get_events(), [(42,)])
+ self.assertRaises(SegmentInfoError, self.__sgmt_info.remove_reader, (1))
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ # b) ID is in readers set.
+ self.__si_to_synchronizing_state()
+ self.__sgmt_info.add_reader(4)
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {4})
+ self.assertListEqual(self.__sgmt_info.get_events(), [(42,)])
+ e = self.__sgmt_info.remove_reader(4)
+ self.assertIsNone(e)
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), set())
+ self.assertListEqual(self.__sgmt_info.get_events(), [(42,)])
+ # we only change state if it was removed from old_readers
+ # specifically and it became empty.
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ # c) ID is in old_readers set and it becomes empty.
+ self.__si_to_synchronizing_state()
+ self.__sgmt_info.add_reader(4)
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {4})
+ self.assertListEqual(self.__sgmt_info.get_events(), [(42,)])
+ e = self.__sgmt_info.remove_reader(3)
+ self.assertTupleEqual(e, (42,))
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), set())
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {4})
+ self.assertListEqual(self.__sgmt_info.get_events(), [])
+ # we only change state if it was removed from old_readers
+ # specifically and it became empty.
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.COPYING)
+
+ # d) ID is in old_readers set and it doesn't become empty.
+ self.__si_to_updating_state()
+ self.__sgmt_info.add_reader(4)
+ self.__sgmt_info.complete_update()
+ self.__sgmt_info.add_reader(5)
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {3, 4})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {5})
+ self.assertListEqual(self.__sgmt_info.get_events(), [(42,)])
+ e = self.__sgmt_info.remove_reader(3)
+ self.assertIsNone(e)
+ self.assertSetEqual(self.__sgmt_info.get_old_readers(), {4})
+ self.assertSetEqual(self.__sgmt_info.get_readers(), {5})
+ self.assertListEqual(self.__sgmt_info.get_events(), [(42,)])
+ # we only change state if it was removed from old_readers
+ # specifically and it became empty.
+ self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
+
+ def test_switch_versions(self):
self.__sgmt_info.switch_versions()
self.__check_sgmt_reset_param(SegmentInfo.WRITER, 1)
self.__check_sgmt_reset_param(SegmentInfo.READER, 0)
@@ -103,9 +380,9 @@ class MockClientList:
class TestDataSrcInfo(unittest.TestCase):
def setUp(self):
- self.__mapped_file_dir = os.environ['TESTDATA_PATH']
+ self.__mapped_file_dir = os.environ['TESTDATA_WRITE_PATH']
self.__mgr_config = {'mapped_file_dir': self.__mapped_file_dir}
- self.__sqlite3_dbfile = os.environ['TESTDATA_PATH'] + '/' + 'zone.db'
+ self.__sqlite3_dbfile = os.environ['TESTDATA_WRITE_PATH'] + '/' + 'zone.db'
self.__clients_map = {
# mixture of 'local' and 'mapped' and 'unused' (type =None)
# segments
diff --git a/src/lib/python/isc/memmgr/tests/testdata/Makefile.am b/src/lib/python/isc/memmgr/tests/testdata/Makefile.am
new file mode 100644
index 0000000..22e7ce3
--- /dev/null
+++ b/src/lib/python/isc/memmgr/tests/testdata/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+ example.com.zone
diff --git a/src/lib/python/isc/memmgr/tests/testdata/example.com.zone b/src/lib/python/isc/memmgr/tests/testdata/example.com.zone
new file mode 100644
index 0000000..24e22e1
--- /dev/null
+++ b/src/lib/python/isc/memmgr/tests/testdata/example.com.zone
@@ -0,0 +1,8 @@
+example.com. 1000 IN SOA a.dns.example.com. mail.example.com. 1 1 1 1 1
+example.com. 1000 IN NS a.dns.example.com.
+example.com. 1000 IN NS b.dns.example.com.
+example.com. 1000 IN NS c.dns.example.com.
+a.dns.example.com. 1000 IN A 1.1.1.1
+b.dns.example.com. 1000 IN A 3.3.3.3
+b.dns.example.com. 1000 IN AAAA 4:4::4:4
+b.dns.example.com. 1000 IN AAAA 5:5::5:5
More information about the bind10-changes
mailing list