Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191913
Change subject: [WIP] test throughput threshold of EventLogging (db-wise)
......................................................................
[WIP] test throughput threshold of EventLogging (db-wise)
Bug: T86244
Change-Id: I44a51763951309f4cc1dc527161f88f8dbc36ac3
wq:Change-Id: I5576749e089731fded828a51f11104d9460c0d25
---
M server/eventlogging/jrm.py
M server/eventlogging/utils.py
2 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/13/191913/1
diff --git a/server/eventlogging/jrm.py b/server/eventlogging/jrm.py
index a83953b..566e063 100644
--- a/server/eventlogging/jrm.py
+++ b/server/eventlogging/jrm.py
@@ -12,7 +12,7 @@
import collections
import datetime
import itertools
-
+import logging
import sqlalchemy
from .schema import get_schema
@@ -210,11 +210,13 @@
def store_sql_events(meta, events, replace=False):
"""Store events in the database."""
+ len_events = str(len(events))
+ logger = logging.getLogger('Log')
queue = [flatten(events.pop()) for _ in range(len(events))]
queue.sort(key=insert_sort_key)
- if (getattr(meta.bind.dialect, 'supports_multivalues_insert', False)
- or getattr(meta.bind.dialect, 'supports_multirow_insert', False)):
+ if (getattr(meta.bind.dialect, 'supports_multivalues_insert', False) or
+ getattr(meta.bind.dialect, 'supports_multirow_insert', False)):
insert = _insert_multi
else:
insert = _insert_sequential
@@ -223,6 +225,7 @@
prepared_events = [prepare(event) for event in events]
table = get_table(meta, scid)
insert(table, prepared_events, replace)
+ logger.debug("Data inserted %s", len_events)
def _property_getter(item):
diff --git a/server/eventlogging/utils.py b/server/eventlogging/utils.py
index 35aef5d..a552085 100644
--- a/server/eventlogging/utils.py
+++ b/server/eventlogging/utils.py
@@ -27,6 +27,7 @@
self.interval = interval
self.ready = threading.Event()
self.stopping = threading.Event()
+ self.logger = logging.getLogger('Log')
super(PeriodicThread, self).__init__(*args, **kwargs)
def run(self):
@@ -43,6 +44,9 @@
# from the desired run interval. The result is how long
# we have to sleep before the next run.
time_to_next_run = self.interval - run_duration
+
+ self.logger.debug('Run duration of sql execution: %s',
+ str(run_duration))
if self.ready.wait(time_to_next_run):
# If the internal flag of `self.ready` was set, we were
@@ -65,4 +69,4 @@
def setup_logging():
logging.basicConfig(stream=sys.stderr, level=logging.DEBUG,
- format='%(asctime)s %(message)s')
+ format='%(asctime)s (%(threadName)-10s) %(message)s')
--
To view, visit https://gerrit.wikimedia.org/r/191913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44a51763951309f4cc1dc527161f88f8dbc36ac3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Nuria <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
