New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Room version upgrade support #4091

Merged
merged 12 commits into from Oct 29, 2018

Conversation

Projects
None yet
2 participants
@richvdh
Member

richvdh commented Oct 25, 2018

Basic support for matrix-org/matrix-doc#1502. This is largely complete, but doesn't currently do anything about aliases.

Factor _generate_room_id out of create_room
we're going to need this for room upgrades.

@richvdh richvdh force-pushed the rav/room_version_upgrades branch from 7afa979 to 29bff69 Oct 25, 2018

@richvdh richvdh force-pushed the rav/room_version_upgrades branch from 29bff69 to 15883e3 Oct 25, 2018

@richvdh richvdh force-pushed the rav/room_version_upgrades branch from 15883e3 to 68c0ce6 Oct 25, 2018

fix broken test
This test stubbed out some stuff in a very weird way. I have no idea why. It broke.

@richvdh richvdh requested a review from matrix-org/synapse-core Oct 25, 2018

@erikjohnston

Looks good. Just some small nits.

"room_id": old_room_id,
"sender": user_id,
"content": {
"body": "This room has been replaced",

This comment has been minimized.

@erikjohnston

erikjohnston Oct 26, 2018

Member

I don't suppose we could somehow be more helpful here? Like add a matrix.to link? IDK

This comment has been minimized.

@richvdh

richvdh Oct 26, 2018

Member

Maybe, I guess? The intention is that the client can interpret the tombstone event anyway.

Show resolved Hide resolved synapse/handlers/room.py
Show resolved Hide resolved synapse/handlers/room.py Outdated
self.hs.hostname,
).to_string()
if isinstance(gen_room_id, bytes):
gen_room_id = gen_room_id.decode('utf-8')

This comment has been minimized.

@erikjohnston

erikjohnston Oct 26, 2018

Member

How on earth can we end up with bytes here?

This comment has been minimized.

@richvdh

richvdh Oct 26, 2018

Member

DomainSpecificString.to_string returns a str, which is a bytes under python 2.

Show resolved Hide resolved synapse/rest/client/v2_alpha/room_upgrade_rest_servlet.py
Show resolved Hide resolved synapse/handlers/room.py Outdated
Address review comments
Improve comments, get old room state from the context we already have

@richvdh richvdh requested a review from erikjohnston Oct 26, 2018

@erikjohnston

woot

@richvdh richvdh merged commit bf33eed into develop Oct 29, 2018

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@richvdh richvdh deleted the rav/room_version_upgrades branch Oct 29, 2018

hawkowl added a commit that referenced this pull request Nov 19, 2018

Merge tag 'v0.33.9'
Features
--------

- Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
([\#4004](#4004), [\#4133](#4133),
[\#4142](#4142), [\#4184](#4184))
- Support for replacing rooms with new ones ([\#4091](#4091), [\#4099](#4099),
[\#4100](#4100), [\#4101](#4101))

Bugfixes
--------

- Fix exceptions when using the email mailer on Python 3. ([\#4095](#4095))
- Fix e2e key backup with more than 9 backup versions ([\#4113](#4113))
- Searches that request profile info now no longer fail with a 500. ([\#4122](#4122))
- fix return code of empty key backups ([\#4123](#4123))
- If the typing stream ID goes backwards (as on a worker when the master restarts), the worker's typing handler will no longer erroneously report rooms containing new
typing events. ([\#4127](#4127))
- Fix table lock of device_lists_remote_cache which could freeze the application ([\#4132](#4132))
- Fix exception when using state res v2 algorithm ([\#4135](#4135))
- Generating the user consent URI no longer fails on Python 3. ([\#4140](#4140),
[\#4163](#4163))
- Loading URL previews from the DB cache on Postgres will no longer cause Unicode type errors when responding to the request, and URL previews will no longer fail if
the remote server returns a Content-Type header with the chartype in quotes. ([\#4157](#4157))
- The hash_password script now works on Python 3. ([\#4161](#4161))
- Fix noop checks when updating device keys, reducing spurious device list update notifications. ([\#4164](#4164))

Deprecations and Removals
-------------------------

- The disused and un-specced identicon generator has been removed. ([\#4106](#4106))
- The obsolete and non-functional /pull federation endpoint has been removed. ([\#4118](#4118))
- The deprecated v1 key exchange endpoints have been removed. ([\#4119](#4119))
- Synapse will no longer fetch keys using the fallback deprecated v1 key exchange method and will now always use v2.
([\#4120](#4120))

Internal Changes
----------------

- Fix build of Docker image with docker-compose ([\#3778](#3778))
- Delete unreferenced state groups during history purge ([\#4006](#4006))
- The "Received rdata" log messages on workers is now logged at DEBUG, not INFO. ([\#4108](#4108))
- Reduce replication traffic for device lists ([\#4109](#4109))
- Fix `synapse_replication_tcp_protocol_*_commands` metric label to be full command name, rather than just the first character
([\#4110](#4110))
- Log some bits about room creation ([\#4121](#4121))
- Fix `tox` failure on old systems ([\#4124](#4124))
- Add STATE_V2_TEST room version ([\#4128](#4128))
- Clean up event accesses and tests ([\#4137](#4137))
- The default logging config will now set an explicit log file encoding of UTF-8. ([\#4138](#4138))
- Add helpers functions for getting prev and auth events of an event ([\#4139](#4139))
- Add some tests for the HTTP pusher. ([\#4149](#4149))
- add purge_history.sh and purge_remote_media.sh scripts to contrib/ ([\#4155](#4155))
- HTTP tests have been refactored to contain less boilerplate. ([\#4156](#4156))
- Drop incoming events from federation for unknown rooms ([\#4165](#4165))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment