diff options
| author | Erik Johnston <erik@matrix.org> | 2020-09-25 09:58:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-25 09:58:32 +0100 |
| commit | 3e87d79e1c6ef894387ee2f24e008dfb8f5f853f (patch) | |
| tree | 19ad2f597cdf1d6969bafc2048442b92d0bcc6a1 /synapse/storage/util | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-3e87d79e1c6ef894387ee2f24e008dfb8f5f853f.tar.xz | |
Fix schema delta for servers that have not backfilled (#8396)
Fixes #8395.
Diffstat (limited to 'synapse/storage/util')
| -rw-r--r-- | synapse/storage/util/id_generators.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/storage/util/id_generators.py b/synapse/storage/util/id_generators.py index 727fcc521c..4269eaf918 100644 --- a/synapse/storage/util/id_generators.py +++ b/synapse/storage/util/id_generators.py @@ -287,8 +287,12 @@ class MultiWriterIdGenerator: min_stream_id = min(self._current_positions.values(), default=None) if min_stream_id is None: + # We add a GREATEST here to ensure that the result is always + # positive. (This can be a problem for e.g. backfill streams where + # the server has never backfilled). sql = """ - SELECT COALESCE(%(agg)s(%(id)s), 1) FROM %(table)s + SELECT GREATEST(COALESCE(%(agg)s(%(id)s), 1), 1) + FROM %(table)s """ % { "id": id_column, "table": table, |