Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix stuck notification counts on small servers (#13168)

Browse Source
This commit is contained in:
Erik Johnston 2022-07-04 16:02:21 +01:00 committed by GitHub
parent 8d7491a152
commit 723ce73d02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13168.bugfix Normal file
View File

@ -0,0 +1 @@
Fix unread counts for users on small servers. Introduced in v1.62.0rc1.

9
synapse/storage/databases/main/event_push_actions.py
View File

@ -972,7 +972,12 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, EventsWorkerStore, SQLBas
stream_row = txn.fetchone() stream_row = txn.fetchone()
if stream_row: if stream_row:
(offset_stream_ordering,) = 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 caught_up = False
else: else:
rotate_to_stream_ordering = self._stream_id_gen.get_current_token() rotate_to_stream_ordering = self._stream_id_gen.get_current_token()
@ -1004,7 +1009,7 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, EventsWorkerStore, SQLBas
SELECT user_id, room_id, count(*) as cnt, SELECT user_id, room_id, count(*) as cnt,
max(stream_ordering) as stream_ordering max(stream_ordering) as stream_ordering
FROM event_push_actions FROM event_push_actions
WHERE ? <= stream_ordering AND stream_ordering < ? WHERE ? < stream_ordering AND stream_ordering <= ?
AND %s = 1 AND %s = 1
GROUP BY user_id, room_id GROUP BY user_id, room_id
) AS upd ) AS upd

10
tests/storage/test_event_push_actions.py
View File

@ -146,12 +146,12 @@ class EventPushActionsStoreTestCase(HomeserverTestCase):
_assert_counts(0, 0) _assert_counts(0, 0)
_inject_actions(1, PlAIN_NOTIF) _inject_actions(1, PlAIN_NOTIF)
_assert_counts(1, 0) _assert_counts(1, 0)
_rotate(2) _rotate(1)
_assert_counts(1, 0) _assert_counts(1, 0)
_inject_actions(3, PlAIN_NOTIF) _inject_actions(3, PlAIN_NOTIF)
_assert_counts(2, 0) _assert_counts(2, 0)
_rotate(4) _rotate(3)
_assert_counts(2, 0) _assert_counts(2, 0)
_inject_actions(5, PlAIN_NOTIF) _inject_actions(5, PlAIN_NOTIF)
@ -162,7 +162,7 @@ class EventPushActionsStoreTestCase(HomeserverTestCase):
_assert_counts(0, 0) _assert_counts(0, 0)
_inject_actions(6, PlAIN_NOTIF) _inject_actions(6, PlAIN_NOTIF)
_rotate(7) _rotate(6)
_assert_counts(1, 0) _assert_counts(1, 0)
self.get_success( self.get_success(
@ -178,13 +178,13 @@ class EventPushActionsStoreTestCase(HomeserverTestCase):
_inject_actions(8, HIGHLIGHT) _inject_actions(8, HIGHLIGHT)
_assert_counts(1, 1) _assert_counts(1, 1)
_rotate(9) _rotate(8)
_assert_counts(1, 1) _assert_counts(1, 1)
# Check that adding another notification and rotating after highlight # Check that adding another notification and rotating after highlight
# works. # works.
_inject_actions(10, PlAIN_NOTIF) _inject_actions(10, PlAIN_NOTIF)
_rotate(11) _rotate(10)
_assert_counts(2, 1) _assert_counts(2, 1)
# Check that sending read receipts at different points results in the # Check that sending read receipts at different points results in the