From: Kazunori Fujiwara Date: Mon, 27 Aug 2012 09:12:47 +0000 (+0900) Subject: [2138] Merge branch 'master' into trac2138 X-Git-Tag: trac2351_base~118 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df38cef2ce0c0856026b7dc3cb0f240fab547668;p=thirdparty%2Fkea.git [2138] Merge branch 'master' into trac2138 --- df38cef2ce0c0856026b7dc3cb0f240fab547668 diff --cc ChangeLog index fac0e0628a,0f899fc6de..f9a6608e9b --- a/ChangeLog +++ b/ChangeLog @@@ -1,12 -1,86 +1,87 @@@ - nnn. [func]* naokikambe, fujiwara + 469. [bug] jelte + libdatasrc: the data source client list class now ignores zone + content problems (such as out-of-zone data) in MasterFiles type + zones, instead of aborting the entire configuration. It only logs + an error, and all other zones and datasources are still loaded. The + error log message has been improved to include the zone origin and + source file name. As a result of this change, b10-auth no longer + exits upon encountering such errors during startup. + (Trac #2178, git a75ed413e8a1c8e3702beea4811a46a1bf519bbd) + + 468. [func]* naokikambe, fujiwara - b10-stats polls bind10 and b10-auth for statistics data. The - "poll-interval" parameter in b10-stats is for configuring the - polling interval. All statistics data collected once are preserved - while b10-stats is running. The "sendstats" command was removed - from bind10 and b10-auth. The "statistics-interval" configuration - item was removed from b10-auth. + b10-stats polls the bind10 and b10-auth with new 'getstats' command - to retrieve statistics data. The polling interval can be configured - by bindctl command. The 'sendstats' command was removed from bind10 - and b10-auth. The 'statistics-interval' config item was removed from - b10-auth. - (Trac #2136, #2137 and #2138, git TBD) ++ to retrieve statistics data. The "poll-interval" parameter in ++ b10-stats is for configuring the polling interval. All statistics ++ data collected once are preserved while b10-stats is running. ++ The "sendstats" command was removed from bind10 and b10-auth. The ++ "statistics-interval" configuration item was removed from b10-auth. + (Trac #2136, git dcb5ce50b4b4e50d28247d5f8b5cb8d90bda942a) + (Trac #2137, git d53bb65a43f6027b15a6edc08c137951e3ce5e0e) - (Trac #2138, git TBD) ++ (Trac #2138, git b34e3313460eebc9c272ca8c1beb27297c195150) + + bind10-devel-20120816 released on August 16, 2012 + + 467. [bug] jelte + For configurations, allow named sets to contain lists of items. + (Trac #2114, git 712637513505f7afb8434292ca2a98c3517dffd3) + + 466. [func] jelte + Allow bindctl to add and remove items to and from lists + and dicts for items of type "any". This is for easier + configurations. + (Trac #2184, git ad2d728d1496a9ff59d622077850eed0638b54eb) + + 465. [doc] vorner + Improved documentation about ACLs in the Guide. + (Trac #2066, git 76f733925b3f3560cfc2ee96d2a19905b623bfc3) + + 464. [func] jelte, muks + libdns++: The LabelSequence class has been extended with some new + methods. These are mainly intended for internal development, but + the class is public, so interested users may want to look into the + extensions. + (Trac #2052, git 57c61f2^..dbef0e2) + (Trac #2053, git 1fc2b06b57a008ec602daa2dac79939b3cc6b65d) + (Trac #2086, git 3fac7d5579c5f51b8e952b50db510b45bfa986f3) + (Trac #2087, git 49ad6346f574d00cfbd1d12905915fd0dd6a0bac) + (Trac #2148, git 285c2845ca96e7ef89f9158f1dea8cda147b6566) + + 463. [func] jinmei + Python isc.dns: the Name, RRType and RRClass classes are now + hashable. So, for example, objects of these classes can be used + as a dictionary key. + (Trac #1883, git 93ec40dd0a1df963c676037cc60c066c748b3030) + + 462. [build] jreed + BIND 10 now compiles against googletest-1.6.0 versions that are + installed on the system as source code. For such versions, use the + --with-gtest-source configure switch. + (Trac #1999, git 6a26d459a40d7eed8ebcff01835377b3394a78de) + + 461. [bug] muks + We now set g+w and g+s permissions (mode 02770) during + installation for the BIND 10 local state directory + ($prefix/var/bind10-devel/) so that permissions to files + and sub-directories created in that directory are inherited. + (Trac #2171, git ab4d20907abdb3ce972172463dcc73405b3dee79) + + 460. [bug] muks + SSHFP's algorithm and fingerprint type checks have been relaxed + such that they will accept any values in [0,255]. This is so that + future algorithm and fingerprint types are accomodated. + (Trac #2124, git 49e6644811a7ad09e1326f20dd73ab43116dfd21) + + 459. [func] tomek + b10-dhcp6: DHCPv6 server component is now integrated into + BIND 10 framework. It can be started from BIND 10 (using bindctl) + and can receive commands. The only supported command for now + is 'Dhcp6 shutdown'. + b10-dhcp4: Command line-switch '-s' to disable msgq was added. + b10-dhcp6: Command line-switch '-s' to disable msgq was added. + (Trac #1708, git e0d7c52a71414f4de1361b09d3c70431c96daa3f) - 458. [build]* jinmei + 458. [build]* jinmei ++>>>>>>> master BIND 10 now relies on Boost offset_ptr, which caused some new portability issues. Such issues are detected at ./configure time. If ./configure stops due to this, try the following workaround: diff --cc doc/guide/bind10-guide.xml index 9b095d2b58,ca197bcacf..49cb419de6 --- a/doc/guide/bind10-guide.xml +++ b/doc/guide/bind10-guide.xml @@@ -1439,14 -1680,13 +1665,14 @@@ can use various data source backends -- sendstats ++ getstats - sendstats tells b10-auth + getstats requests b10-auth to send its statistics data to - b10-stats8 - immediately. + b10-stats + 8 + as a response of the command. diff --cc doc/guide/bind10-messages.xml index bbd6470fa2,bbd6470fa2..79dfe655ad --- a/doc/guide/bind10-messages.xml +++ b/doc/guide/bind10-messages.xml @@@ -420,16 -420,16 +420,6 @@@ This is a debug message reporting that -- --AUTH_RECEIVED_SENDSTATS command 'sendstats' received -- --This is a debug message issued when the authoritative server has received --a command from the statistics module to send it data. The 'sendstats' --command is handled differently to other commands, which is why the debug --message associated with it has its own code. -- -- -- AUTH_RESPONSE_FAILURE exception while building response to query: %1 diff --cc tests/system/bindctl/tests.sh index ee0303a226,019461f445..9611c9048d --- a/tests/system/bindctl/tests.sh +++ b/tests/system/bindctl/tests.sh @@@ -96,14 -102,23 +96,18 @@@ sleep echo 'Stats show ' | $RUN_BINDCTL \ --csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1 - # The statistics counters should have been reset while stop/start. - cnt_value1=0 - cnt_value2=1 + # The statistics counters can not be reset even after auth + # restarts. Because stats preserves the query counts which the dying + # auth sent. Then it cumulates them and new counts which the living + # auth sends. This note assumes that the issue would have been + # resolved : "#1941 stats lossage (multiple auth servers)". + cnt_value1=`expr $cnt_value1 + 0` + cnt_value2=`expr $cnt_value2 + 1` cnt_value3=`expr $cnt_value1 + $cnt_value2` -# Further changes of Boss(#2137) and Auth(#2138) depends on this -# change(#2136). So statistics tests in this system test make no -# sense. Following statistics tests are disabled until codes of both -# #2137 and #2138 are merged. -#grep $cnt_name1".*\<"$cnt_value1"\>" bindctl.out.$n > /dev/null || status=1 -#grep $cnt_name2".*\<"$cnt_value2"\>" bindctl.out.$n > /dev/null || status=1 -#grep $cnt_name3".*\<"$cnt_value3"\>" bindctl.out.$n > /dev/null || status=1 -#if [ $status != 0 ]; then echo "I:failed"; fi -echo "I:skipped" +grep $cnt_name1".*\<"$cnt_value1"\>" bindctl.out.$n > /dev/null || status=1 +grep $cnt_name2".*\<"$cnt_value2"\>" bindctl.out.$n > /dev/null || status=1 +grep $cnt_name3".*\<"$cnt_value3"\>" bindctl.out.$n > /dev/null || status=1 +if [ $status != 0 ]; then echo "I:failed"; fi n=`expr $n + 1` echo "I:Changing the data source from sqlite3 to in-memory ($n)" @@@ -162,10 -182,16 +166,11 @@@ d --csv-file-dir=$BINDCTL_CSV_DIR > bindctl.out.$n || status=1 # The statistics counters should keep being consistent even while # multiple b10-auths are running. + - # Further changes of Boss(#2137) and Auth(#2138) depends on this - # change(#2136). So statistics tests in this system test make no - # sense. Following statistics tests are disabled until codes of both - # #2137 and #2138 are merged. - #grep $cnt_name1".*\<"$cnt_value1"\>" bindctl.out.$n > /dev/null || status=1 - #grep $cnt_name2".*\<"$cnt_value2"\>" bindctl.out.$n > /dev/null || status=1 - #grep $cnt_name3".*\<"$cnt_value3"\>" bindctl.out.$n > /dev/null || status=1 - #if [ $status != 0 ]; then echo "I:failed "; break ; fi - echo "I:skipped" + grep $cnt_name1".*\<"$cnt_value1"\>" bindctl.out.$n > /dev/null || status=1 + grep $cnt_name2".*\<"$cnt_value2"\>" bindctl.out.$n > /dev/null || status=1 + grep $cnt_name3".*\<"$cnt_value3"\>" bindctl.out.$n > /dev/null || status=1 + if [ $status != 0 ]; then echo "I:failed "; break ; fi done n=`expr $n + 1`