openstack/devstack
Code Issues Proposed changes

Merge "Fix NotImplementedError in dbcounter on SQLA 2.x"

Browse Source
This commit is contained in:
Zuul
2023-03-13 18:52:52 +00:00
committed by Gerrit Code Review
parent 3894077e6c f834f9adaf
commit 35c9afffa5
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/Fix-dbcounter-NotImplementedError-on-SQLAlchemy-2-21bb6dcdf3ce4225.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes a NotImplementedError when using the dbcounter SQLAlchemy plugin on
SQLAlchemy 2.x.

11
tools/dbcounter/dbcounter.py
View File

@@ -40,6 +40,9 @@ class LogCursorEventsPlugin(CreateEnginePlugin):
self.queue = queue.Queue() self.queue = queue.Queue()
self.thread = None self.thread = None
def update_url(self, url):
return url.difference_update_query(["dbcounter"])
def engine_created(self, engine): def engine_created(self, engine):
"""Hook the engine creation process. """Hook the engine creation process.
@@ -77,12 +80,12 @@ class LogCursorEventsPlugin(CreateEnginePlugin):
def do_incr(self, db, op, count): def do_incr(self, db, op, count):
"""Increment the counter for (db,op) by count.""" """Increment the counter for (db,op) by count."""
query = ('INSERT INTO queries (db, op, count) ' query = sqlalchemy.text('INSERT INTO queries (db, op, count) '
' VALUES (%s, %s, %s) ' ' VALUES (:db, :op, :count) '
' ON DUPLICATE KEY UPDATE count=count+%s') ' ON DUPLICATE KEY UPDATE count=count+:count')
try: try:
with self.engine.begin() as conn: with self.engine.begin() as conn:
r = conn.execute(query, (db, op, count, count)) r = conn.execute(query, {'db': db, 'op': op, 'count': count})
except Exception as e: except Exception as e:
LOG.error('Failed to account for access to database %r: %s', LOG.error('Failed to account for access to database %r: %s',
db, e) db, e)