Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only start censor background job after indices are created

This commit is contained in:
Erik Johnston 2019-12-10 11:39:31 +00:00
parent 52fe9788bc
commit cc5f6eb608
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/storage/data_stores/main/events.py
View File

@ -1053,6 +1053,13 @@ class EventsStore(
if self.hs.config.redaction_retention_period is None: if self.hs.config.redaction_retention_period is None:
return return
if self.db.updates.has_completed_background_update(
"redactions_have_censored_ts_idx"
):
# We don't want to run this until the appropriate index has been
# created.
return
before_ts = self._clock.time_msec() - self.hs.config.redaction_retention_period before_ts = self._clock.time_msec() - self.hs.config.redaction_retention_period
# We fetch all redactions that: # We fetch all redactions that:

4
synapse/storage/data_stores/main/schema/delta/56/redaction_censor2.sql
View File

@ -18,5 +18,5 @@ ALTER TABLE redactions ADD COLUMN received_ts BIGINT;
INSERT INTO background_updates (update_name, progress_json) VALUES INSERT INTO background_updates (update_name, progress_json) VALUES
('redactions_received_ts', '{}'); ('redactions_received_ts', '{}');
INSERT INTO background_updates (update_name, progress_json) VALUES INSERT INTO background_updates (update_name, progress_json, depends_on) VALUES
('redactions_have_censored_ts_idx', '{}'); ('redactions_have_censored_ts_idx', '{}', 'redactions_have_censored_idx');