summary refs log tree commit diff
path: root/synapse/storage/databases/main/task_scheduler.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-08-23 13:46:10 +0100
committerErik Johnston <erik@matrix.org>2023-08-23 13:46:10 +0100
commitb7d0c7d3fd5caaf24efa63dc20efb74ad640c0a6 (patch)
tree214fdb142593f642eb20ea0ba145c687b3638bed /synapse/storage/databases/main/task_scheduler.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentFix rare deadlock when using read/write locks (#16133) (diff)
downloadsynapse-b7d0c7d3fd5caaf24efa63dc20efb74ad640c0a6.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/databases/main/task_scheduler.py')
-rw-r--r--synapse/storage/databases/main/task_scheduler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/task_scheduler.py b/synapse/storage/databases/main/task_scheduler.py

index 1fb3180c3c..9ab120eea9 100644 --- a/synapse/storage/databases/main/task_scheduler.py +++ b/synapse/storage/databases/main/task_scheduler.py
@@ -92,7 +92,7 @@ class TaskSchedulerWorkerStore(SQLBaseStore): if clauses: sql = sql + " WHERE " + " AND ".join(clauses) - sql = sql + "ORDER BY timestamp" + sql = sql + " ORDER BY timestamp" txn.execute(sql, args) return self.db_pool.cursor_to_dict(txn)