[gentoo-commits] proj/R_overlay:master commit in: roverlay/stats/, roverlay/overlay/

[André Erdmann]

commit:     34630b84c18176e658c5a7c8f60df27616191ea2
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 30 16:09:27 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 30 16:09:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=34630b84

stats collection: count dropped packages

* count dropped packages (package info rejected by overlay.add)
* use heartbeat/step from config
* don't create daily stats

---
 roverlay/overlay/creator.py |  2 ++
 roverlay/stats/base.py      |  3 ++-
 roverlay/stats/collector.py |  8 +++++---
 roverlay/stats/rrd.py       | 24 ++++++++++--------------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/roverlay/overlay/creator.py b/roverlay/overlay/creator.py
index 0666335..c21617e 100644
--- a/roverlay/overlay/creator.py
+++ b/roverlay/overlay/creator.py
@@ -134,6 +134,8 @@ class OverlayCreator ( object ):
             )
             self._pkg_queue.put ( ejob )
             self.stats.pkg_queued.inc()
+         else:
+            self.stats.pkg_dropped.inc()
       else:
          # else filtered out
          self.stats.pkg_filtered.inc()

diff --git a/roverlay/stats/base.py b/roverlay/stats/base.py
index b93b6b8..b51226e 100644
--- a/roverlay/stats/base.py
+++ b/roverlay/stats/base.py
@@ -66,13 +66,14 @@ class OverlayCreationStats ( OverlayCreationWorkerStats ):
    DESCRIPTION = "overlay creation"
 
    _MEMBERS = (
-      ( 'creation_time', 'pkg_queued', 'pkg_filtered', )
+      ( 'creation_time', 'pkg_queued', 'pkg_filtered', 'pkg_dropped', )
       + OverlayCreationWorkerStats._MEMBERS
    )
 
    def __init__ ( self ):
       super ( OverlayCreationStats, self ).__init__()
       self.pkg_queued    = abstract.Counter ( "queued" )
+      self.pkg_dropped   = abstract.Counter ( "dropped" )
       self.pkg_filtered  = abstract.Counter ( "filtered" )
       self.creation_time = abstract.TimeStats ( "ebuild creation" )
    # --- end of __init__ (...) ---

diff --git a/roverlay/stats/collector.py b/roverlay/stats/collector.py
index 30b0e76..85eb358 100644
--- a/roverlay/stats/collector.py
+++ b/roverlay/stats/collector.py
@@ -80,7 +80,9 @@ class StatsCollector ( abstract.RoverlayStatsBase ):
 
       self.db_collector     = dbcollector.StatsDBCollector ( self )
       self._database        = rrd.StatsDB (
-         conf.get_or_fail ( "RRD_DB.file" ), self.db_collector
+         filepath  = conf.get_or_fail ( 'RRD_DB.file' ),
+         collector = self.db_collector,
+         step      = conf.get_or_fail ( 'RRD_DB.step' ),
       )
       self._database.create_if_missing()
    # --- end of setup_database (...) ---
@@ -101,11 +103,11 @@ class StatsCollector ( abstract.RoverlayStatsBase ):
       return str ( visualize.CreationStatsVisualizer ( self ) )
    # --- end of to_creation_str (...) ---
 
-   def write_db ( self ):
+   def write_database ( self ):
       self.db_collector.update()
       self._database.update()
       self._database.commit()
-   # --- end of write_db (...) ---
+   # --- end of write_database (...) ---
 
 # --- end of StatsCollector ---
 

diff --git a/roverlay/stats/rrd.py b/roverlay/stats/rrd.py
index 66da434..2f9cce3 100644
--- a/roverlay/stats/rrd.py
+++ b/roverlay/stats/rrd.py
@@ -13,18 +13,15 @@ from roverlay.db.rrdtool import RRDVariable, RRDArchive
 
 class StatsDB ( roverlay.db.rrdtool.RRD ):
 
-   # default step
-   STEP = 300
-
-   def __init__ ( self, filepath, collector, step=None ):
+   def __init__ ( self, filepath, collector, step ):
+      super ( StatsDB, self ).__init__ ( filepath )
       # COULDFIX:
       #  vars / RRA creation is only necessary when creating a new database
       #
       self.collector    = collector
+      self.step         = int ( step )
       self.rrd_vars     = self.make_vars()
       self.rrd_archives = self.make_rra()
-      self.step         = step if step is not None else self.__class__.STEP
-      super ( StatsDB, self ).__init__ ( filepath )
    # --- end of __init__ (...) ---
 
    def _do_create ( self, filepath ):
@@ -33,11 +30,9 @@ class StatsDB ( roverlay.db.rrdtool.RRD ):
             'create', filepath,
             '--start', str ( self.INIT_TIME ),
             '--step', str ( self.step ),
-         ) + tuple (
-            v.get_key() for v in self.rrd_vars
-         ) + tuple (
-            v.get_key() for v in self.rrd_archives
          )
+         + tuple ( v.get_key() for v in self.rrd_vars )
+         + tuple ( v.get_key() for v in self.rrd_archives )
       )
    # --- end of _do_create (...) ---
 
@@ -46,17 +41,18 @@ class StatsDB ( roverlay.db.rrdtool.RRD ):
    # --- end of update (...) ---
 
    def make_vars ( self ):
+      heartbeat = 2 * self.step
       return tuple (
-         RRDVariable ( k, 'DERIVE', val_max=0 )
+         RRDVariable ( k, 'DERIVE', val_max=0, heartbeat=heartbeat )
             for k in self.collector.NUMSTATS_KEYS
       )
    # --- end of make_vars (...) ---
 
    def make_rra ( self ):
       return (
-         RRDArchive.new_day   ( 'LAST',    0.7 ),
-         RRDArchive.new_week  ( 'AVERAGE', 0.7 ),
-         RRDArchive.new_month ( 'AVERAGE', 0.7 ),
+         #RRDArchive.new_day   ( 'LAST',    0.7, step=self.step ),
+         RRDArchive.new_week  ( 'AVERAGE', 0.7, step=self.step ),
+         RRDArchive.new_month ( 'AVERAGE', 0.7, step=self.step ),
       )
    # --- end of make_rra (...) ---