Synapse 1.7.2 (2019-12-20)

==========================
 
 This release fixes some regressions introduced in Synapse 1.7.0 and 1.7.1.
 
 Bugfixes
 --------
 
 - Fix a regression introduced in Synapse 1.7.1 which caused errors when attempting to backfill rooms over federation. ([\#6576](https://github.com/matrix-org/synapse/issues/6576))
 - Fix a bug introduced in Synapse 1.7.0 which caused an error on startup when upgrading from versions before 1.3.0. ([\#6578](https://github.com/matrix-org/synapse/issues/6578))
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEv27Axt/F4vrTL/8QOSor00I9eP8FAl38qxEACgkQOSor00I9
 eP/i6gf9FD14MfGWbDekRBKvCp7x1AQNqBOjcRDdXVENq8lUyGZmgKPRzdQ889pJ
 9QgzPGCIo37qfIYNS1xWIU/53iTKSH50UamJQqViROW5+E3kOHozF2yzRxuoiNZP
 gpPolPrQjC6kZo04zXu1N/BCTN4KUOjeXgrr10WtlRMatkNu3+diJ5cpPewFib4O
 Gl2GTTp/scLfGTtBdwUEpWD3YkO6rAlYyDfNFNZwb9ua8Rf+NDB/eV0djJ5qzO0U
 AeOt0JcYOeut/7vi5HkqZWl5ZxpIYydM6mHibv6Bijpzr2XV1pFAxWqsqmPcdqH2
 oL9Ml0pNJ++6m4CRSMyLPfWvI1OuEQ==
 =sfNw
 -----END PGP SIGNATURE-----

Merge tag 'v1.7.2'

Synapse 1.7.2 (2019-12-20)
==========================

This release fixes some regressions introduced in Synapse 1.7.0 and 1.7.1.

Bugfixes
--------

- Fix a regression introduced in Synapse 1.7.1 which caused errors when attempting to backfill rooms over federation. ([\#6576](https://github.com/matrix-org/synapse/issues/6576))
- Fix a bug introduced in Synapse 1.7.0 which caused an error on startup when upgrading from versions before 1.3.0. ([\#6578](https://github.com/matrix-org/synapse/issues/6578))
pull/6581/head
Richard van der Hoff 2019-12-20 11:09:59 +00:00
commit 138708608b
5 changed files with 32 additions and 3 deletions

View File

@ -1,3 +1,15 @@
Synapse 1.7.2 (2019-12-20)
==========================
This release fixes some regressions introduced in Synapse 1.7.0 and 1.7.1.
Bugfixes
--------
- Fix a regression introduced in Synapse 1.7.1 which caused errors when attempting to backfill rooms over federation. ([\#6576](https://github.com/matrix-org/synapse/issues/6576))
- Fix a bug introduced in Synapse 1.7.0 which caused an error on startup when upgrading from versions before 1.3.0. ([\#6578](https://github.com/matrix-org/synapse/issues/6578))
Synapse 1.7.1 (2019-12-18)
==========================

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
matrix-synapse-py3 (1.7.2) stable; urgency=medium
* New synapse release 1.7.2.
-- Synapse Packaging team <packages@matrix.org> Fri, 20 Dec 2019 10:56:50 +0000
matrix-synapse-py3 (1.7.1) stable; urgency=medium
* New synapse release 1.7.1.

View File

@ -36,7 +36,7 @@ try:
except ImportError:
pass
__version__ = "1.7.1"
__version__ = "1.7.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

View File

@ -797,7 +797,10 @@ class FederationHandler(BaseHandler):
events_to_state = {}
for e_id in edges:
state, auth = yield self._get_state_for_room(
destination=dest, room_id=room_id, event_id=e_id
destination=dest,
room_id=room_id,
event_id=e_id,
include_event_in_state=False,
)
auth_events.update({a.event_id: a for a in auth})
auth_events.update({s.event_id: s for s in state})

View File

@ -25,6 +25,9 @@ class Sqlite3Engine(object):
def __init__(self, database_module, database_config):
self.module = database_module
database = database_config.get("args", {}).get("database")
self._is_in_memory = database in (None, ":memory:",)
# The current max state_group, or None if we haven't looked
# in the DB yet.
self._current_state_group_id = None
@ -59,7 +62,12 @@ class Sqlite3Engine(object):
return sql
def on_new_connection(self, db_conn):
prepare_database(db_conn, self, config=None)
if self._is_in_memory:
# In memory databases need to be rebuilt each time. Ideally we'd
# reuse the same connection as we do when starting up, but that
# would involve using adbapi before we have started the reactor.
prepare_database(db_conn, self, config=None)
db_conn.create_function("rank", 1, _rank)
def is_deadlock(self, error):