From: Mukund Sivaraman Date: Thu, 7 Nov 2013 06:24:29 +0000 (+0530) Subject: Merge branch 'trac2300' X-Git-Tag: bind10-1.2.0beta1-release~102^2~30 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4655c110afa0ec6f5669bf53245bffe6b30ece4b;p=thirdparty%2Fkea.git Merge branch 'trac2300' Conflicts: src/bin/xfrin/b10-xfrin.xml src/bin/xfrin/xfrin.spec tests/lettuce/features/xfrin_notify_handling.feature --- 4655c110afa0ec6f5669bf53245bffe6b30ece4b diff --cc src/bin/xfrin/b10-xfrin.xml index ceae54c347,49b05ed786..0b58f9a866 --- a/src/bin/xfrin/b10-xfrin.xml +++ b/src/bin/xfrin/b10-xfrin.xml @@@ -337,27 -337,88 +337,109 @@@ operatio + + ixfr_running + + Number of IXFRs in progress + + + + + axfr_running + + Number of AXFRs in progress + + + + + soa_in_progress + + Number of SOA queries in progress + + + + + socket + + A directory name of socket statistics + + + + + ipversion + + A directory name of an IP version as ipv4 or ipv6 + + + + + tcp + + A directory name of TCP statistics + + + + + open + + IPv4 or IPv6 TCP sockets opened successfully + + + + + openfail + + IPv4 or IPv6 TCP sockets open failures + + + + + close + + IPv4 or IPv6 TCP sockets closed + + + + + connfail + + IPv4 or IPv6 TCP sockets connection failures + + + + + conn + + IPv4 or IPv6 TCP connections established successfully + + + + + senderr + + IPv4 or IPv6 TCP sockets send errors + + + + + recverr + + IPv4 or IPv6 TCP sockets receive errors + + + + + + + + + + + + + + + diff --cc src/bin/xfrin/xfrin.spec index 826fde4ae8,87bb91e018..a662f756da --- a/src/bin/xfrin/xfrin.spec +++ b/src/bin/xfrin/xfrin.spec @@@ -251,29 -251,226 +251,250 @@@ } } }, + { + "item_name": "ixfr_running", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "IXFRs running", + "item_description": "Number of IXFRs in progress" + }, + { + "item_name": "axfr_running", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "AXFRs running", + "item_description": "Number of AXFRs in progress" + }, + { + "item_name": "soa_in_progress", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "SOA queries", + "item_description": "Number of SOA queries in progress" ++ }, + { + "item_name": "socket", + "item_type": "map", + "item_optional": false, + "item_default": { + "ipv4": { + "tcp": { + "open": 0, + "openfail": 0, + "close": 0, + "connfail": 0, + "conn": 0, + "senderr": 0, + "recverr": 0 + } + }, + "ipv6": { + "tcp": { + "open": 0, + "openfail": 0, + "close": 0, + "connfail": 0, + "conn": 0, + "senderr": 0, + "recverr": 0 + } + } + }, + "item_title": "Socket", + "item_description": "A directory name of socket statistics", + "map_item_spec": [ + { + "item_name": "ipv4", + "item_type": "map", + "item_optional": false, + "item_default": { + "tcp": { + "open": 0, + "openfail": 0, + "close": 0, + "connfail": 0, + "conn": 0, + "senderr": 0, + "recverr": 0 + } + }, + "item_title": "IPv4", + "item_description": "A directory name of IPv4", + "map_item_spec": [ + { + "item_name": "tcp", + "item_type": "map", + "item_optional": false, + "item_default": { + "open": 0, + "openfail": 0, + "close": 0, + "connfail": 0, + "conn": 0, + "senderr": 0, + "recverr": 0 + }, + "item_title": "TCP", + "item_description": "A directory name of TCP statistics", + "map_item_spec": [ + { + "item_name": "open", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Open", + "item_description": "IPv4 TCP sockets opened successfully" + }, + { + "item_name": "openfail", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Open failures", + "item_description": "IPv4 TCP sockets open failures" + }, + { + "item_name": "close", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Close", + "item_description": "IPv4 TCP sockets closed" + }, + { + "item_name": "connfail", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Connect failures", + "item_description": "IPv4 TCP sockets connection failures" + }, + { + "item_name": "conn", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Connect", + "item_description": "IPv4 TCP connections established successfully" + }, + { + "item_name": "senderr", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Send errors", + "item_description": "IPv4 TCP sockets send errors" + }, + { + "item_name": "recverr", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Receive errors", + "item_description": "IPv4 TCP sockets receive errors" + } + ] + } + ] + }, + { + "item_name": "ipv6", + "item_type": "map", + "item_optional": false, + "item_default": { + "tcp": { + "open": 0, + "openfail": 0, + "close": 0, + "connfail": 0, + "conn": 0, + "senderr": 0, + "recverr": 0 + } + }, + "item_title": "IPv6", + "item_description": "A directory name of IPv6", + "map_item_spec": [ + { + "item_name": "tcp", + "item_type": "map", + "item_optional": false, + "item_default": { + "open": 0, + "openfail": 0, + "close": 0, + "connfail": 0, + "conn": 0, + "senderr": 0, + "recverr": 0 + }, + "item_title": "TCP", + "item_description": "A directory name of TCP statistics", + "map_item_spec": [ + { + "item_name": "open", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Open", + "item_description": "IPv6 TCP sockets opened successfully" + }, + { + "item_name": "openfail", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Open failures", + "item_description": "IPv6 TCP sockets open failures" + }, + { + "item_name": "close", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Close", + "item_description": "IPv6 TCP sockets closed" + }, + { + "item_name": "connfail", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Connect failures", + "item_description": "IPv6 TCP sockets connection failures" + }, + { + "item_name": "conn", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Connect", + "item_description": "IPv6 TCP connections established successfully" + }, + { + "item_name": "senderr", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Send errors", + "item_description": "IPv6 TCP sockets send errors" + }, + { + "item_name": "recverr", + "item_type": "integer", + "item_optional": false, + "item_default": 0, + "item_title": "Receive errors", + "item_description": "IPv6 TCP sockets receive errors" + } + ] + } + ] + } + ] } ] } diff --cc tests/lettuce/features/xfrin_notify_handling.feature index 4822552926,387fd731d5..2f43dfdfe6 --- a/tests/lettuce/features/xfrin_notify_handling.feature +++ b/tests/lettuce/features/xfrin_notify_handling.feature @@@ -116,8 -110,10 +116,12 @@@ Feature: Xfrin incoming notify handlin | zones.IN.example.org..axfrreqv6 | 1 | | | zones.IN.example.org..xfrsuccess | 1 | | | zones.IN.example.org..last_axfr_duration | | 0.0 | + | soa_in_progress | 0 | | + | axfr_running | 0 | | + | socket.ipv6.tcp.open | | 1 | + | socket.ipv6.tcp.close | | 1 | + | socket.ipv6.tcp.conn | | 1 | + | socket.ipv6.tcp.connfail | 0 | | # # Test for handling incoming notify only in IPv4 @@@ -224,8 -216,10 +228,12 @@@ | zones.IN.example.org..axfrreqv4 | 1 | | | zones.IN.example.org..xfrsuccess | 1 | | | zones.IN.example.org..last_axfr_duration | | 0.0 | + | soa_in_progress | 0 | | + | axfr_running | 0 | | + | socket.ipv4.tcp.open | | 1 | + | socket.ipv4.tcp.close | | 1 | + | socket.ipv4.tcp.conn | | 1 | + | socket.ipv4.tcp.connfail | 0 | | # # Test for Xfr request rejected @@@ -330,14 -320,16 +338,18 @@@ When I query statistics of bind10 module Xfrin with cmdctl The statistics counters are 0 in category .Xfrin except for the following items | item_name | item_value | min_value | - | zones.IN._SERVER_.soaoutv6 | 1 | | - | zones.IN._SERVER_.axfrreqv6 | 1 | | - | zones.IN._SERVER_.xfrfail | 1 | | - | zones.IN.example.org..soaoutv6 | 1 | | - | zones.IN.example.org..axfrreqv6 | 1 | | - | zones.IN.example.org..xfrfail | 1 | | + | zones.IN._SERVER_.soaoutv6 | | 1 | + | zones.IN._SERVER_.axfrreqv6 | | 1 | + | zones.IN._SERVER_.xfrfail | | 1 | + | zones.IN.example.org..soaoutv6 | | 1 | + | zones.IN.example.org..axfrreqv6 | | 1 | + | zones.IN.example.org..xfrfail | | 1 | + | soa_in_progress | | 0 | + | axfr_running | | 0 | + | socket.ipv6.tcp.open | | 1 | + | socket.ipv6.tcp.close | | 1 | + | socket.ipv6.tcp.conn | | 1 | + | socket.ipv6.tcp.connfail | 0 | | # # Test for Xfr request rejected in IPv4 @@@ -442,14 -430,16 +454,18 @@@ When I query statistics of bind10 module Xfrin with cmdctl The statistics counters are 0 in category .Xfrin except for the following items | item_name | item_value | min_value | - | zones.IN._SERVER_.soaoutv4 | 1 | | - | zones.IN._SERVER_.axfrreqv4 | 1 | | - | zones.IN._SERVER_.xfrfail | 1 | | - | zones.IN.example.org..soaoutv4 | 1 | | - | zones.IN.example.org..axfrreqv4 | 1 | | - | zones.IN.example.org..xfrfail | 1 | | + | zones.IN._SERVER_.soaoutv4 | | 1 | + | zones.IN._SERVER_.axfrreqv4 | | 1 | + | zones.IN._SERVER_.xfrfail | | 1 | + | zones.IN.example.org..soaoutv4 | | 1 | + | zones.IN.example.org..axfrreqv4 | | 1 | + | zones.IN.example.org..xfrfail | | 1 | + | soa_in_progress | | 0 | + | axfr_running | | 0 | + | socket.ipv4.tcp.open | | 1 | + | socket.ipv4.tcp.close | | 1 | + | socket.ipv4.tcp.conn | | 1 | + | socket.ipv4.tcp.connfail | 0 | | # # Test for unreachable slave