summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-30 14:51:41 +0100
committerErik Johnston <erik@matrix.org>2019-07-30 14:51:41 +0100
commit15056ca2086f3165a74cad65d35b2b742caf4fee (patch)
treeee7bb57de2b5f9f34b635a91408fa0f7640ba2bd /synapse
parentMerge pull request #5789 from matrix-org/erikj/fix_error_handling_keys (diff)
downloadsynapse-15056ca2086f3165a74cad65d35b2b742caf4fee.tar.xz
Fix current_state_events membership background update.
Turns out not all rooms are in `rooms`, so lets fetch the room list from
`current_state_events`. We move the delta file to force it to be run
again.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/roommember.py2
-rw-r--r--synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql (renamed from synapse/storage/schema/delta/56/current_state_events_membership.sql)0
2 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index e60409ed73..eecb276465 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -935,7 +935,7 @@ class RoomMemberStore(RoomMemberWorkerStore):
             while processed < batch_size:
                 txn.execute(
                     """
-                        SELECT MIN(room_id) FROM rooms WHERE room_id > ?
+                        SELECT MIN(room_id) FROM current_state_events WHERE room_id > ?
                     """,
                     (last_processed_room,),
                 )
diff --git a/synapse/storage/schema/delta/56/current_state_events_membership.sql b/synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql
index b2e08cd85d..b2e08cd85d 100644
--- a/synapse/storage/schema/delta/56/current_state_events_membership.sql
+++ b/synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql