BIND 10 track2046, updated. 7d3bb3bf33a847c65749a9e38d07649579702055 [2046] Implement the MasterFiles special case
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jun 27 20:14:46 UTC 2012
The branch, track2046 has been updated
via 7d3bb3bf33a847c65749a9e38d07649579702055 (commit)
from d7aa2b1a7da3fab212446f0d09a8420e7718ae64 (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 7d3bb3bf33a847c65749a9e38d07649579702055
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Wed Jun 27 22:14:29 2012 +0200
[2046] Implement the MasterFiles special case
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/client_list.cc | 95 ++++++++++++++++++-------
src/lib/datasrc/client_list.h | 11 +--
src/lib/datasrc/tests/client_list_unittest.cc | 9 ++-
3 files changed, 79 insertions(+), 36 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index 8b42d24..ae304ce 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -30,11 +30,19 @@ namespace datasrc {
ConfigurableClientList::DataSourceInfo::DataSourceInfo(
DataSourceClient* data_src_client,
- const DataSourceClientContainerPtr& container, bool hasCache) :
+ const DataSourceClientContainerPtr& container, bool has_cache) :
data_src_client_(data_src_client),
container_(container)
{
- if (hasCache) {
+ if (has_cache) {
+ cache_.reset(new InMemoryClient);
+ }
+}
+
+ConfigurableClientList::DataSourceInfo::DataSourceInfo(bool has_cache) :
+ data_src_client_(NULL)
+{
+ if (has_cache) {
cache_.reset(new InMemoryClient);
}
}
@@ -58,48 +66,83 @@ ConfigurableClientList::configure(const Element& config, bool allow_cache) {
if (paramConf == ConstElementPtr()) {
paramConf.reset(new NullElement());
}
- // TODO: Special-case the master files type.
- // Ask the factory to create the data source for us
- const DataSourcePair ds(this->getDataSourceClient(type,
- paramConf));
const bool want_cache(allow_cache &&
dconf->contains("cache-enable") &&
dconf->get("cache-enable")->boolValue());
- // And put it into the vector
- new_data_sources.push_back(DataSourceInfo(ds.first, ds.second,
- want_cache));
+
+ if (type == "MasterFiles") {
+ // In case the cache is not allowed, we just skip the master
+ // files (at least for now)
+ if (!allow_cache) {
+ continue;
+ }
+ if (!want_cache) {
+ isc_throw(ConfigurationError, "The cache must be enabled "
+ "for the MasterFiles type");
+ }
+ new_data_sources.push_back(DataSourceInfo(true));
+ } else {
+ // Ask the factory to create the data source for us
+ const DataSourcePair ds(this->getDataSourceClient(type,
+ paramConf));
+ // And put it into the vector
+ new_data_sources.push_back(DataSourceInfo(ds.first, ds.second,
+ want_cache));
+ }
+
if (want_cache) {
- if (!dconf->contains("cache-zones")) {
+ if (!dconf->contains("cache-zones") && type != "MasterFiles") {
isc_throw(isc::NotImplemented, "Auto-detection of zones "
"to cache is not yet implemented, supply "
"cache-zones parameter");
// TODO: Auto-detect list of all zones in the
// data source.
}
- const ConstElementPtr zones(dconf->get("cache-zones"));
+
+ // List the zones we are loading
+ vector<string> zones_origins;
+ if (type == "MasterFiles") {
+ const map<string, ConstElementPtr>
+ zones_files(paramConf->mapValue());
+ for (map<string, ConstElementPtr>::const_iterator
+ it(zones_files.begin()); it != zones_files.end();
+ ++it) {
+ zones_origins.push_back(it->first);
+ }
+ } else {
+ const ConstElementPtr zones(dconf->get("cache-zones"));
+ for (size_t i(0); i < zones->size(); ++i) {
+ zones_origins.push_back(zones->get(i)->stringValue());
+ }
+ }
+
const shared_ptr<InMemoryClient>
cache(new_data_sources.back().cache_);
const DataSourceClient* const
client(new_data_sources.back().data_src_client_);
- for (size_t i(0); i < zones->size(); ++i) {
- const Name origin(zones->get(i)->stringValue());
- const DataSourceClient::FindResult
- zone(client->findZone(origin));
- if (zone.code != result::SUCCESS) {
- // The data source does not contain the zone, it can't
- // be cached.
- isc_throw(ConfigurationError, "Unable to cache "
- "non-existent zone " << origin);
- }
+ for (vector<string>::const_iterator it(zones_origins.begin());
+ it != zones_origins.end(); ++it) {
+ const Name origin(*it);
shared_ptr<InMemoryZoneFinder>
finder(new
InMemoryZoneFinder(rrclass_, origin));
- ZoneIteratorPtr iterator(client->getIterator(origin));
- if (!iterator) {
- isc_throw(isc::Unexpected, "Got NULL iterator for "
- "zone " << origin);
+ if (type == "MasterFiles") {
+ finder->load(paramConf->get(*it)->stringValue());
+ } else {
+ ZoneIteratorPtr iterator;
+ try {
+ iterator = client->getIterator(origin);
+ }
+ catch (const DataSourceError&) {
+ isc_throw(ConfigurationError, "Unable to cache "
+ "non-existent zone " << origin);
+ }
+ if (!iterator) {
+ isc_throw(isc::Unexpected, "Got NULL iterator for "
+ "zone " << origin);
+ }
+ finder->load(*iterator);
}
- finder->load(*iterator);
cache->addZone(finder);
}
}
diff --git a/src/lib/datasrc/client_list.h b/src/lib/datasrc/client_list.h
index 7e7e890..75dae74 100644
--- a/src/lib/datasrc/client_list.h
+++ b/src/lib/datasrc/client_list.h
@@ -236,16 +236,11 @@ public:
///
/// \todo The content yet to be defined.
struct DataSourceInfo {
- /// \brief Default constructor.
- ///
- /// Don't use directly. It is here so the structure can live in
- /// a vector.
- DataSourceInfo() :
- data_src_client_(NULL)
- {}
+ // Plays a role of default constructor too (for vector)
+ DataSourceInfo(bool has_cache = false);
DataSourceInfo(DataSourceClient* data_src_client,
const DataSourceClientContainerPtr& container,
- bool hasCache);
+ bool has_cache);
DataSourceClient* data_src_client_;
DataSourceClientContainerPtr container_;
boost::shared_ptr<InMemoryClient> cache_;
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index ee5d3c6..8625d33 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -150,7 +150,12 @@ public:
} else if (name == Name("null.org")) {
return (ZoneIteratorPtr());
} else {
- return (ZoneIteratorPtr(new Iterator(name)));
+ FindResult result(findZone(name));
+ if (result.code == isc::datasrc::result::SUCCESS) {
+ return (ZoneIteratorPtr(new Iterator(name)));
+ } else {
+ isc_throw(DataSourceError, "No such zone");
+ }
}
}
const string type_;
@@ -737,7 +742,7 @@ TEST_F(ListTest, masterFiles) {
true);
// If cache is not enabled, nothing is loaded
- list_->configure(*elem, true);
+ list_->configure(*elem, false);
EXPECT_EQ(0, list_->getDataSources().size());
}
More information about the bind10-changes
mailing list