Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-24 09:19:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6714 from matrix-org/babolivier/retention_select_event

Browse Source 
Fix instantiation of message retention purge jobs
This commit is contained in:
Brendan Abolivier 2020-01-17 14:23:51 +00:00 committed by GitHub
commit 3b72bb780a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix a bug causing Synapse to not always purge quiet rooms with a low `max_lifetime` in their message retention policies when running the automated purge jobs.

2
synapse/handlers/pagination.py
View File

@ -156,7 +156,7 @@ class PaginationHandler(object):
stream_ordering = yield self.store.find_first_stream_ordering_after_ts(ts) stream_ordering = yield self.store.find_first_stream_ordering_after_ts(ts)
r = yield self.store.get_room_event_after_stream_ordering( r = yield self.store.get_room_event_before_stream_ordering(
room_id, stream_ordering, room_id, stream_ordering,
) )
if not r: if not r:

2
synapse/rest/admin/__init__.py
View File

@ -107,7 +107,7 @@ class PurgeHistoryRestServlet(RestServlet):
stream_ordering = await self.store.find_first_stream_ordering_after_ts(ts) stream_ordering = await self.store.find_first_stream_ordering_after_ts(ts)
r = await self.store.get_room_event_after_stream_ordering( r = await self.store.get_room_event_before_stream_ordering(
room_id, stream_ordering room_id, stream_ordering
) )
if not r: if not r:

10
synapse/storage/data_stores/main/stream.py
View File

@ -525,8 +525,8 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
return rows, token return rows, token
def get_room_event_after_stream_ordering(self, room_id, stream_ordering): def get_room_event_before_stream_ordering(self, room_id, stream_ordering):
"""Gets details of the first event in a room at or after a stream ordering """Gets details of the first event in a room at or before a stream ordering
Args: Args:
room_id (str): room_id (str):
@ -541,15 +541,15 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
sql = ( sql = (
"SELECT stream_ordering, topological_ordering, event_id" "SELECT stream_ordering, topological_ordering, event_id"
" FROM events" " FROM events"
" WHERE room_id = ? AND stream_ordering >= ?" " WHERE room_id = ? AND stream_ordering <= ?"
" AND NOT outlier" " AND NOT outlier"
" ORDER BY stream_ordering" " ORDER BY stream_ordering DESC"
" LIMIT 1" " LIMIT 1"
) )
txn.execute(sql, (room_id, stream_ordering)) txn.execute(sql, (room_id, stream_ordering))
return txn.fetchone() return txn.fetchone()
return self.db.runInteraction("get_room_event_after_stream_ordering", _f) return self.db.runInteraction("get_room_event_before_stream_ordering", _f)
@defer.inlineCallbacks @defer.inlineCallbacks
def get_room_events_max_id(self, room_id=None): def get_room_events_max_id(self, room_id=None):