BIND 10 trac2044, updated. 42b565e0690fc72752047c9aa73f249fae1162a4 [2044] Load zones into the cache
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jun 26 12:33:00 UTC 2012
The branch, trac2044 has been updated
via 42b565e0690fc72752047c9aa73f249fae1162a4 (commit)
from 6d84b65cd4206e960b441fa47dff7c6b1b3ced6d (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 42b565e0690fc72752047c9aa73f249fae1162a4
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Tue Jun 26 14:32:31 2012 +0200
[2044] Load zones into the cache
Only the ones that are requested.
This needs a lot of error handling added.
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/client_list.cc | 21 ++++++++
src/lib/datasrc/tests/client_list_unittest.cc | 67 ++++++++++++++++++++++++-
2 files changed, 86 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index dd39c3b..b9d9241 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -21,7 +21,9 @@
#include <boost/foreach.hpp>
using namespace isc::data;
+using namespace isc::dns;
using namespace std;
+using namespace boost;
namespace isc {
namespace datasrc {
@@ -66,6 +68,25 @@ ConfigurableClientList::configure(const Element& config, bool allowCache) {
// And put it into the vector
new_data_sources.push_back(DataSourceInfo(ds.first, ds.second,
wantCache));
+ if (wantCache) {
+ const ConstElementPtr zones(dconf->get("cache-zones"));
+ 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));
+ // TODO check it is SUCCESS
+ shared_ptr<InMemoryZoneFinder>
+ finder(new
+ InMemoryZoneFinder(zone.zone_finder->getClass(),
+ origin));
+ finder->load(*client->getIterator(origin));
+ cache->addZone(finder);
+ }
+ }
}
// If everything is OK up until now, we have the new configuration
// ready. So just put it there and let the old one die when we exit
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index 3d55c49..af428b3 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -14,9 +14,13 @@
#include <datasrc/client_list.h>
#include <datasrc/client.h>
+#include <datasrc/iterator.h>
#include <datasrc/data_source.h>
+#include <datasrc/memory_datasrc.h>
#include <dns/rrclass.h>
+#include <dns/rrttl.h>
+#include <dns/rdataclass.h>
#include <gtest/gtest.h>
@@ -41,7 +45,7 @@ public:
Name getOrigin() const { return (origin_); }
// The rest is not to be called, so just have them
RRClass getClass() const {
- isc_throw(isc::NotImplemented, "Not implemented");
+ return (RRClass::IN());
}
shared_ptr<Context> find(const Name&, const RRType&,
const FindOptions)
@@ -60,6 +64,35 @@ public:
private:
Name origin_;
};
+ class Iterator : public ZoneIterator {
+ public:
+ Iterator(const Name& origin) :
+ origin_(origin),
+ finished_(false),
+ soa_(new RRset(origin_, RRClass::IN(), RRType::SOA(), RRTTL(3600)))
+ {
+ // The RData here is bogus, but it is not used to anything. There
+ // just needs to be some.
+ soa_->addRdata(rdata::generic::SOA(Name::ROOT_NAME(),
+ Name::ROOT_NAME(),
+ 0, 0, 0, 0, 0));
+ }
+ virtual isc::dns::ConstRRsetPtr getNextRRset() {
+ if (finished_) {
+ return (ConstRRsetPtr());
+ } else {
+ finished_ = true;
+ return (soa_);
+ }
+ }
+ virtual isc::dns::ConstRRsetPtr getSOA() const {
+ return (soa_);
+ }
+ private:
+ const Name origin_;
+ bool finished_;
+ const isc::dns::RRsetPtr soa_;
+ };
// Constructor from a list of zones.
MockDataSourceClient(const char* zone_names[]) {
for (const char** zone(zone_names); *zone; ++zone) {
@@ -72,7 +105,13 @@ public:
const ConstElementPtr& configuration) :
type_(type),
configuration_(configuration)
- {}
+ {
+ if (configuration_->getType() == Element::list) {
+ for (size_t i(0); i < configuration_->size(); ++i) {
+ zones.insert(Name(configuration_->get(i)->stringValue()));
+ }
+ }
+ }
virtual FindResult findZone(const Name& name) const {
if (zones.empty()) {
return (FindResult(result::NOTFOUND, ZoneFinderPtr()));
@@ -103,6 +142,9 @@ public:
{
isc_throw(isc::NotImplemented, "Not implemented");
}
+ virtual ZoneIteratorPtr getIterator(const Name& name, bool) const {
+ return (ZoneIteratorPtr(new Iterator(name)));
+ }
const string type_;
const ConstElementPtr configuration_;
private:
@@ -515,4 +557,25 @@ TEST_F(ListTest, configureCacheDisabled) {
checkDS(1, "type2", "{}", false);
}
+// Put some zones into the cache
+TEST_F(ListTest, cacheZones) {
+ ConstElementPtr elem(Element::fromJSON("["
+ "{"
+ " \"type\": \"type1\","
+ " \"cache-enable\": true,"
+ " \"cache-zones\": [\"example.org\", \"example.com\"],"
+ " \"params\": [\"example.org\", \"example.com\", \"exmaple.cz\"]"
+ "}]"));
+ list_->configure(*elem, true);
+ checkDS(0, "type1", "[\"example.org\", \"example.com\", \"exmaple.cz\"]",
+ true);
+
+ const shared_ptr<InMemoryClient> cache(list_->getDataSources()[0].cache_);
+ EXPECT_EQ(2, cache->getZoneCount());
+
+ EXPECT_EQ(result::SUCCESS, cache->findZone(Name("example.org")).code);
+ EXPECT_EQ(result::SUCCESS, cache->findZone(Name("example.com")).code);
+ EXPECT_EQ(result::NOTFOUND, cache->findZone(Name("example.cz")).code);
+}
+
}
More information about the bind10-changes
mailing list