BIND 10 trac2562, updated. b6b3a1a1073b2f674c8ba189635069d3ecadc8bd [2562] added a test case where zonemgr is not running when notify comes.
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 28 02:51:22 UTC 2013
The branch, trac2562 has been updated
via b6b3a1a1073b2f674c8ba189635069d3ecadc8bd (commit)
via 5156bc4dbb05a5803b87e57751ffc7ba94e4ac98 (commit)
via 68e9b6e28b981e394f1fd55de00840e861695044 (commit)
from b41986aa9d6b0d78642082abeb8186ef5d7bf431 (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 b6b3a1a1073b2f674c8ba189635069d3ecadc8bd
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed Mar 27 19:50:52 2013 -0700
[2562] added a test case where zonemgr is not running when notify comes.
commit 5156bc4dbb05a5803b87e57751ffc7ba94e4ac98
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed Mar 27 19:48:37 2013 -0700
[2562] set want_answer to true in group_sendmsg() for notify handling.
without this we can't catch the case where zonemgr isn't running timely.
a unit test is updated to check that condition, too.
commit 68e9b6e28b981e394f1fd55de00840e861695044
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed Mar 27 19:47:07 2013 -0700
[2562] extended mock session to inspect last value of "want_answer"
also made some methods const member functions as they don't have to be
mutable.
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/auth_srv.cc | 4 +-
src/bin/auth/tests/auth_srv_unittest.cc | 5 +++
src/lib/testutils/mockups.h | 17 ++++++---
.../lettuce/features/xfrin_notify_handling.feature | 39 ++++++++++++++++++++
4 files changed, 59 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 5613f3a..3fe9b9c 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -22,6 +22,7 @@
#include <config/ccsession.h>
#include <cc/data.h>
+#include <cc/proto_defs.h>
#include <exceptions/exceptions.h>
@@ -813,7 +814,8 @@ AuthSrvImpl::processNotify(const IOMessage& io_message, Message& message,
command_template_end);
const unsigned int seq =
xfrin_session_->group_sendmsg(notify_command, "Zonemgr",
- "*", "*");
+ CC_INSTANCE_WILDCARD,
+ CC_INSTANCE_WILDCARD, true);
ConstElementPtr env, answer, parsed_answer;
xfrin_session_->group_recvmsg(env, answer, false, seq);
int rcode;
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index a478f4b..8ca65fd 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -26,6 +26,8 @@
#include <dns/rdataclass.h>
#include <dns/tsig.h>
+#include <cc/proto_defs.h>
+
#include <server_common/portconfig.h>
#include <server_common/keyring.h>
@@ -885,6 +887,9 @@ TEST_F(AuthSrvTest, notifyWithoutRecipient) {
// happens.
server.processMessage(*io_message, *parse_message, *response_obuffer,
&dnsserv);
+ // want_answer should have been set to true so auth can catch it if zonemgr
+ // is not running.
+ EXPECT_TRUE(notify_session.wasAnswerWanted());
EXPECT_FALSE(dnsserv.hasAnswer());
}
diff --git a/src/lib/testutils/mockups.h b/src/lib/testutils/mockups.h
index 8ba2287..58b39ee 100644
--- a/src/lib/testutils/mockups.h
+++ b/src/lib/testutils/mockups.h
@@ -40,15 +40,16 @@ public:
MockSession() :
// by default we return a simple "success" message.
msg_(isc::data::Element::fromJSON("{\"result\": [0, \"SUCCESS\"]}")),
- send_ok_(true), receive_ok_(true)
+ send_ok_(true), receive_ok_(true), answer_wanted_(false)
{}
virtual void establish(const char*) {}
virtual void disconnect() {}
- virtual int group_sendmsg(isc::data::ConstElementPtr msg, std::string group,
- std::string, std::string, bool)
+ virtual int group_sendmsg(isc::data::ConstElementPtr msg,
+ std::string group,
+ std::string, std::string, bool want_answer)
{
if (!send_ok_) {
isc_throw(isc::cc::SessionError,
@@ -57,6 +58,7 @@ public:
sent_msg_ = msg;
msg_dest_ = group;
+ answer_wanted_ = want_answer;
return (0);
}
@@ -93,8 +95,12 @@ public:
void disableSend() { send_ok_ = false; }
void disableReceive() { receive_ok_ = false; }
- isc::data::ConstElementPtr getSentMessage() { return (sent_msg_); }
- std::string getMessageDest() { return (msg_dest_); }
+ isc::data::ConstElementPtr getSentMessage() const { return (sent_msg_); }
+ std::string getMessageDest() const { return (msg_dest_); }
+
+ /// \brief Return the value of want_answer parameter of the previous call
+ /// to group_sendmsg().
+ bool wasAnswerWanted() const { return (answer_wanted_); }
private:
isc::data::ConstElementPtr sent_msg_;
@@ -102,6 +108,7 @@ private:
isc::data::ConstElementPtr msg_;
bool send_ok_;
bool receive_ok_;
+ bool answer_wanted_;
};
// This mock object does nothing except for recording passed parameters
diff --git a/tests/lettuce/features/xfrin_notify_handling.feature b/tests/lettuce/features/xfrin_notify_handling.feature
index 81378b9..a17ce42 100644
--- a/tests/lettuce/features/xfrin_notify_handling.feature
+++ b/tests/lettuce/features/xfrin_notify_handling.feature
@@ -334,3 +334,42 @@ Feature: Xfrin incoming notify handling
Then wait for new master stderr message NOTIFY_OUT_REPLY_RECEIVED
A query for www.example.org to [::1]:47806 should have rcode NXDOMAIN
+
+ #
+ # Test for NOTIFY when zonemgr is not running
+ #
+ Scenario: Handle incoming notify while zonemgr is not running
+ Given I have bind10 running with configuration xfrin/retransfer_master.conf with cmdctl port 47804 as master
+ And wait for master stderr message BIND10_STARTED_CC
+ And wait for master stderr message CMDCTL_STARTED
+ And wait for master stderr message AUTH_SERVER_STARTED
+ And wait for master stderr message XFROUT_STARTED
+ And wait for master stderr message ZONEMGR_STARTED
+ And wait for master stderr message STATS_STARTING
+
+ And I have bind10 running with configuration xfrin/retransfer_slave_notify.conf
+ And wait for bind10 stderr message BIND10_STARTED_CC
+ And wait for bind10 stderr message CMDCTL_STARTED
+ And wait for bind10 stderr message AUTH_SERVER_STARTED
+ And wait for bind10 stderr message XFRIN_STARTED
+ And wait for bind10 stderr message ZONEMGR_STARTED
+
+ # remove zonemgr from the system. a subsequent notify is ignored, but
+ # an error message shouldn't be logged at auth.
+ When I send bind10 the following commands with cmdctl
+ """
+ config remove Init/components b10-zonemgr
+ config commit
+ """
+ last bindctl output should not contain "error"
+ And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+
+ A query for www.example.org to [::1]:47806 should have rcode NXDOMAIN
+
+ When I send bind10 with cmdctl port 47804 the command Xfrout notify example.org IN
+ Then wait for master stderr message XFROUT_NOTIFY_COMMAND
+ Then wait for new bind10 stderr message AUTH_RECEIVED_NOTIFY
+ Then wait for new bind10 stderr message AUTH_ZONEMGR_NOTEXIST not AUTH_ZONEMGR_ERROR
+ Then wait for master stderr message NOTIFY_OUT_TIMEOUT not NOTIFY_OUT_REPLY_RECEIVED
+
+ A query for www.example.org to [::1]:47806 should have rcode NXDOMAIN
More information about the bind10-changes
mailing list