fix events aggregation bugs #6

kelvich · kelvich · commit 4d50a6d12ad1 · 2016-06-07T16:56:46.000+03:00
diff --git a/contrib/mmts/tests2/lib/bank_client.py b/contrib/mmts/tests2/lib/bank_client.py
@@ -62,7 +62,10 @@ def check_total(self):
         conn = psycopg2.connect(self.connstr)
         cur = conn.cursor();
         while self.run.value:
+            event_id = self.history.register_start('total')
             cur.execute('select sum(amount) from bank_test')
+            self.history.register_finish(event_id, 'commit')
+
             res = cur.fetchone()
             if res[0] != 0:
                 print("Isolation error, total = %d" % (res[0],))
@@ -83,7 +86,7 @@ def transfer_money(self):
             from_uid = random.randrange(1, self.accounts + 1)
             to_uid = random.randrange(1, self.accounts + 1)
 
-            event_id = self.history.register_start('tx')
+            event_id = self.history.register_start('transfer')
 
             cur.execute('''update bank_test
                     set amount = amount - %s
@@ -119,7 +122,6 @@ def start(self):
         self.total_process = Process(target=self.watchdog, args=())
         self.total_process.start()
 
-
         return
 
     def stop(self):
diff --git a/contrib/mmts/tests2/lib/event_history.py b/contrib/mmts/tests2/lib/event_history.py
@@ -10,6 +10,14 @@ def __init__(self):
         self.queue = Queue()
         self.events = []
         self.running_events = {}
+        self.last_aggregation = datetime.datetime.now()
+        self.agg_template = {
+            'commit': 0,
+            'rollback': 0,
+            'max_latency': 0.0,
+            'running': 0,
+            'running_latency': 0.0
+        }
 
     def register_start(self, name):
         event_id = uuid.uuid4()
@@ -54,22 +62,24 @@ def aggregate(self):
 
         agg = {}
         for ev in self.events:
-            if ev['name'] in agg:
-                named_agg = agg[ev['name']]
-                latency = (ev['finished_at'] - ev['started_at']).total_seconds()
-                if ev['status'] in named_agg:
-                    named_agg[ev['status']] += 1
-                    if named_agg['max_latency'] < latency:
-                        named_agg['max_latency'] = latency
-                else:
-                    named_agg[ev['status']] = 0
-                    named_agg['max_latency'] = latency
-            else:
-                agg[ev['name']] = {}
+            if ev['finished_at'] < self.last_aggregation:
+                continue
+
+            if ev['name'] not in agg:
+                agg[ev['name']] = self.agg_template.copy()
+
+            named_agg = agg[ev['name']]
+            latency = (ev['finished_at'] - ev['started_at']).total_seconds()
+            named_agg[ev['status']] += 1
+            if named_agg['max_latency'] < latency:
+                named_agg['max_latency'] = latency
 
         for value in self.running_events.itervalues():
+            if value['name'] not in agg:
+                agg[value['name']] = self.agg_template.copy()
+
             named_agg = agg[value['name']]
-            latency = (datetime.datetime.now() - ev['started_at']).total_seconds()
+            latency = (datetime.datetime.now() - value['time']).total_seconds()
             if 'started' in named_agg:
                 named_agg['running'] += 1
                 if latency > named_agg['running_latency']:
@@ -78,6 +88,7 @@ def aggregate(self):
                 named_agg['running'] = 1
                 named_agg['running_latency'] = latency
 
+        self.last_aggregation = datetime.datetime.now()
         return agg
 
     def aggregate_by(self, period):
