Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-07 02:24:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rename 'populate_stats_process_rooms_2' background job back to 'populate_stats_process_rooms' again (#8243)

Browse source 
Fixes https://github.com/matrix-org/synapse/issues/8238

Alongside the delta file, some changes were also necessary to the codebase to remove references to the now defunct `populate_stats_process_rooms_2` background job. Thankfully the latter doesn't seem to have made it into any documentation yet :)
This commit is contained in:
Andrew Morgan 2020-09-08 11:05:59 +01:00 • committed by GitHub
parent 8d6f97f932
commit 68cdb3708e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

36
synapse/storage/databases/main/stats.py
View file

@ -73,9 +73,6 @@ class StatsStore(StateDeltasStore):
self.db_pool.updates.register_background_update_handler(
"populate_stats_process_rooms", self._populate_stats_process_rooms
)
self.db_pool.updates.register_background_update_handler(
"populate_stats_process_rooms_2", self._populate_stats_process_rooms_2
)
self.db_pool.updates.register_background_update_handler(
"populate_stats_process_users", self._populate_stats_process_users
)
@ -148,31 +145,10 @@ class StatsStore(StateDeltasStore):
return len(users_to_work_on)
async def _populate_stats_process_rooms(self, progress, batch_size):
"""
This was a background update which regenerated statistics for rooms.
It has been replaced by StatsStore._populate_stats_process_rooms_2. This background
job has been scheduled to run as part of Synapse v1.0.0, and again now. To ensure
someone upgrading from <v1.0.0, this background task has been turned into a no-op
so that the potentially expensive task is not run twice.
Further context: https://github.com/matrix-org/synapse/pull/7977
"""
await self.db_pool.updates._end_background_update(
"populate_stats_process_rooms"
)
return 1
async def _populate_stats_process_rooms_2(self, progress, batch_size):
"""
This is a background update which regenerates statistics for rooms.
It replaces StatsStore._populate_stats_process_rooms. See its docstring for the
reasoning.
"""
"""This is a background update which regenerates statistics for rooms."""
if not self.stats_enabled:
await self.db_pool.updates._end_background_update(
"populate_stats_process_rooms_2"
"populate_stats_process_rooms"
)
return 1
@ -189,13 +165,13 @@ class StatsStore(StateDeltasStore):
return [r for r, in txn]
rooms_to_work_on = await self.db_pool.runInteraction(
"populate_stats_rooms_2_get_batch", _get_next_batch
"populate_stats_rooms_get_batch", _get_next_batch
)
# No more rooms -- complete the transaction.
if not rooms_to_work_on:
await self.db_pool.updates._end_background_update(
"populate_stats_process_rooms_2"
"populate_stats_process_rooms"
)
return 1
@ -204,9 +180,9 @@ class StatsStore(StateDeltasStore):
progress["last_room_id"] = room_id
await self.db_pool.runInteraction(
"_populate_stats_process_rooms_2",
"_populate_stats_process_rooms",
self.db_pool.updates._background_update_progress_txn,
"populate_stats_process_rooms_2",
"populate_stats_process_rooms",
progress,
)