diff options
| author | Andrej Shadura <andrewsh@debian.org> | 2020-10-15 20:02:02 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2020-10-15 20:02:02 +0200 |
| commit | 547115d704df226061a23b0d97154d484f707e5c (patch) | |
| tree | 8aafa09d76635694d6356e66a657e267f9b765c5 /synapse | |
| parent | ed5fbaf60ada9ec07f23eb2e4d4f48213ee79438 (diff) | |
New upstream version 1.21.2
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/util/id_generators.py | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 722b53a6..83b8e489 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.21.1" +__version__ = "1.21.2" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/storage/util/id_generators.py b/synapse/storage/util/id_generators.py index ad017207..eccd2d5b 100644 --- a/synapse/storage/util/id_generators.py +++ b/synapse/storage/util/id_generators.py @@ -612,14 +612,7 @@ class _MultiWriterCtxManager: db_autocommit=True, ) - # Assert the fetched ID is actually greater than any ID we've already - # seen. If not, then the sequence and table have got out of sync - # somehow. with self.id_gen._lock: - assert max(self.id_gen._current_positions.values(), default=0) < min( - self.stream_ids - ) - self.id_gen._unfinished_ids.update(self.stream_ids) if self.multiple_ids is None: |