BIND 10 trac2274, updated. c1fdeed57f879e88f4b66fb8caee16494e025c8e [2274] added checking the initial values introduced on #2274

[BIND 10 source code commits]

The branch, trac2274 has been updated
  discards  b4b0a5553b78c925b1a7308168eba69d38d54067 (commit)
  discards  e999c388e2ca3ca37f735bfed8ec438d1cbd1822 (commit)
  discards  dc67019a8e4621081659f35c92f93356b854cce8 (commit)
  discards  b6374d1bb6dd5ded61ded19bf8f4c7e523a8dd4b (commit)
  discards  73b28533ad4098d49e3c66811737f6ab41397d4a (commit)
  discards  7a57ac5ab8435dc37d70dc790da085e88a31eb71 (commit)
  discards  a05ca51e224a70f021e10e709669302c8e4c4e37 (commit)
       via  c1fdeed57f879e88f4b66fb8caee16494e025c8e (commit)
       via  c6ec184ca5be7ee2dd2bb4c9dc701893f0c97b34 (commit)
       via  31e96ef279f588af8cd7b8aca8013a469425b4ec (commit)
       via  11bb0ee5a5cecc673041766435bf25d59010b30f (commit)
       via  b2e2566f267d8e6958211ffd0bfd08121520521a (commit)
       via  f67061fa530c7f325c571e031b870c53cd502737 (commit)
       via  edd494b274512597bde1f9acc5e7a4f9b7b397cc (commit)
       via  d1b06874353849175446f37dfca5a95f66ce5093 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (b4b0a5553b78c925b1a7308168eba69d38d54067)
            \
             N -- N -- N (c1fdeed57f879e88f4b66fb8caee16494e025c8e)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 c1fdeed57f879e88f4b66fb8caee16494e025c8e
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri Sep 28 14:35:39 2012 +0900

    [2274] added checking the initial values introduced on #2274

commit c6ec184ca5be7ee2dd2bb4c9dc701893f0c97b34
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Wed Sep 19 17:46:06 2012 +0900

    [2274] added introduced statistics items into the manpage of b10-xfrin

commit 31e96ef279f588af8cd7b8aca8013a469425b4ec
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Wed Sep 19 17:45:37 2012 +0900

    [2274] updated the BaseTestXfrCounter class for testing new statistics items
    
    - moved up test_xfrrunning_counters() to the BaseTestXfrCounter class
    
    - added a new variable holding a name list from target counter class

commit 11bb0ee5a5cecc673041766435bf25d59010b30f
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Wed Sep 19 17:51:23 2012 +0900

    [2274] updated the XfrinCounter class for adding new statistics items
    
    - moved up _create_xfrrunning_functors() to the Counter class for sharing
    
    - added a name list for new statistics items

commit b2e2566f267d8e6958211ffd0bfd08121520521a
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Wed Sep 19 17:44:44 2012 +0900

    [2274] added tests for addition of new Xfrin statistics items
    
    It checks the value returned from the getter method of each item.

commit f67061fa530c7f325c571e031b870c53cd502737
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Wed Sep 19 16:59:47 2012 +0900

    [2274] introduced new incrementers/decrementers into XfrinConnection
    
    incrementers:
      inc_soa_in_progress()
      inc_ixfr_deferred()
      inc_axfr_deferred()
      inc_ixfr_running()
      inc_axfr_running()
    
    decrementers:
      dec_soa_in_progress()
      dec_ixfr_deferred()
      dec_axfr_deferred()
      dec_ixfr_running()
      dec_axfr_running()

commit edd494b274512597bde1f9acc5e7a4f9b7b397cc
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Wed Sep 19 16:58:55 2012 +0900

    [2274] added definitions of new statistics items for Xfrin

-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrin/xfrin.py.in |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 214a898..0b14e74 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -935,6 +935,10 @@ class XfrinConnection(asyncore.dispatcher):
                 self.init_socket()
                 if not self.connect_to_master():
                     raise XfrinException('Unable to reconnect to master')
+
+            # start statistics timer
+            getattr(counter,
+                    'start_time_to_%s' % req_str.lower())(self._zone_name)
             try:
                 # increment deferred xfers
                 getattr(counter, 'inc_%s_deferred' % req_str.lower())()
@@ -942,15 +946,11 @@ class XfrinConnection(asyncore.dispatcher):
                 self._send_query(self._request_type)
             finally:
                 # decrement deferred xfers
-                getattr(counter, 'dec_%s_deferred' % \
-                            req_str.lower())()
+                getattr(counter, 'dec_%s_deferred' % req_str.lower())()
             # count xfer requests for statistics
             getattr(counter,
                     'inc_%sreq%s' % (req_str.lower(), self.get_ipver_str()))\
                     (self._zone_name)
-            # start timer for measuring xfering
-            getattr(counter,
-                    'start_time_to_%s' % req_str.lower())(self._zone_name)
             # increment xfers running
             getattr(counter, 'inc_%s_running' % req_str.lower())()
             self.__state = XfrinInitialSOA()
@@ -979,6 +979,10 @@ class XfrinConnection(asyncore.dispatcher):
                             "%.f" % self._transfer_stats.get_bytes_per_second()
                            )
 
+            # stop start timer
+            getattr(counter,
+                    'stop_time_to_%s' % req_str.lower())(self._zone_name)
+
         except XfrinZoneUptodate:
             # Eventually we'll probably have to treat this case as a trigger
             # of trying another primary server, etc, but for now we treat it
@@ -1014,10 +1018,6 @@ class XfrinConnection(asyncore.dispatcher):
             if ret == XFRIN_OK:
                 # count successful xfer requests
                 counter.inc_xfrsuccess(self._zone_name)
-                # stop timer for measuring xfering
-                getattr(counter,
-                        'stop_time_to_%s' % req_str.lower())\
-                        (self._zone_name)
             elif ret == XFRIN_FAIL:
                 # count failed xfer requests
                 counter.inc_xfrfail(self._zone_name)