diff options
| author | Andrew Morgan <andrewm@element.io> | 2022-07-04 17:35:06 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrewm@element.io> | 2022-07-04 17:35:06 +0100 |
| commit | 6180e1bc4b56bfd16b54102abe9ba4f6346b1e5e (patch) | |
| tree | 2497a2d4906d3d3856ff0622c66057b20ffb41d8 /synapse | |
| parent | Remove tests/utils.py from mypy's exclude list (#13159) (diff) | |
| parent | Update changelog for v1.62.0rc2 (diff) | |
| download | synapse-6180e1bc4b56bfd16b54102abe9ba4f6346b1e5e.tar.xz | |
Merge tag 'v1.62.0rc3' into develop
Synapse 1.62.0rc3 (2022-07-04) ============================== Bugfixes -------- - Update the version of the [ldap3 plugin](https://github.com/matrix-org/matrix-synapse-ldap3/) included in the `matrixdotorg/synapse` DockerHub images and the Debian packages hosted on `packages.matrix.org` to 0.2.1. This fixes [a bug](https://github.com/matrix-org/matrix-synapse-ldap3/pull/163) with usernames containing uppercase characters. ([\#13156](https://github.com/matrix-org/synapse/issues/13156)) - Fix a bug introduced in Synapse 1.62.0rc1 affecting unread counts for users on small servers. ([\#13168](https://github.com/matrix-org/synapse/issues/13168))
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/databases/main/event_push_actions.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/event_push_actions.py b/synapse/storage/databases/main/event_push_actions.py index f432d578b5..bb6e104d71 100644 --- a/synapse/storage/databases/main/event_push_actions.py +++ b/synapse/storage/databases/main/event_push_actions.py @@ -982,7 +982,12 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas stream_row = txn.fetchone() if stream_row: (offset_stream_ordering,) = stream_row - rotate_to_stream_ordering = offset_stream_ordering + + # We need to bound by the current token to ensure that we handle + # out-of-order writes correctly. + rotate_to_stream_ordering = min( + offset_stream_ordering, self._stream_id_gen.get_current_token() + ) caught_up = False else: rotate_to_stream_ordering = self._stream_id_gen.get_current_token() @@ -1014,7 +1019,7 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas SELECT user_id, room_id, count(*) as cnt, max(stream_ordering) as stream_ordering FROM event_push_actions - WHERE ? <= stream_ordering AND stream_ordering < ? + WHERE ? < stream_ordering AND stream_ordering <= ? AND %s = 1 GROUP BY user_id, room_id ) AS upd |