Skip to content
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

Transfer rooms on groups on room upgrade #6235

Merged
merged 3 commits into from Nov 7, 2019
Merged

Conversation

@anoadragon453
Copy link
Member

anoadragon453 commented Oct 22, 2019

Fixes #4897
Includes commits from #6232

When a user joins a room that's been upgraded, have the server check if that room is present on any local groups. If so, add its successor to the group, then remove the upgraded room.

When a server sees a room for the first time, or when a server upgrades a room itself, it will check if any groups it has contains that room, and if so removes it from the group and adds the upgraded room instead.

Sytest: matrix-org/sytest#737

@anoadragon453 anoadragon453 self-assigned this Oct 22, 2019
@anoadragon453 anoadragon453 added this to In progress in Homeserver Task Board via automation Oct 22, 2019
@anoadragon453 anoadragon453 force-pushed the anoa/room_upgrade_groups branch from f98420a to 0ab08d0 Oct 22, 2019
@anoadragon453 anoadragon453 moved this from In progress to Review in Homeserver Task Board Oct 22, 2019
@anoadragon453 anoadragon453 requested a review from matrix-org/synapse-core Oct 22, 2019
@anoadragon453 anoadragon453 moved this from Review to In progress in Homeserver Task Board Oct 30, 2019
@anoadragon453 anoadragon453 force-pushed the anoa/room_upgrade_groups branch from 6d06916 to cf2124d Oct 30, 2019
@anoadragon453 anoadragon453 requested a review from richvdh Oct 30, 2019
@anoadragon453 anoadragon453 moved this from In progress to Review in Homeserver Task Board Oct 30, 2019
@anoadragon453 anoadragon453 changed the base branch from develop to anoa/room_upgrade_depublishing Oct 30, 2019
@richvdh richvdh changed the base branch from anoa/room_upgrade_depublishing to develop Oct 30, 2019
@anoadragon453 anoadragon453 requested a review from richvdh Nov 5, 2019
@richvdh
richvdh approved these changes Nov 7, 2019
Copy link
Member

richvdh left a comment

lgtm!

@anoadragon453 anoadragon453 merged commit e914cf1 into develop Nov 7, 2019
20 checks passed
20 checks passed
buildkite/synapse Build #5383 passed (27 minutes, 53 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 32 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 40 seconds)
Details
buildkite/synapse/isort Passed (17 seconds)
Details
buildkite/synapse/mypy Passed (22 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (15 seconds)
Details
buildkite/synapse/packaging Passed (19 seconds)
Details
buildkite/synapse/pipeline Passed (4 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (16 minutes, 27 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (6 minutes, 58 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (8 minutes, 28 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (7 minutes, 5 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (18 minutes, 4 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (17 minutes, 22 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (6 minutes, 56 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-5-slash-postgres-9-dot-5 Passed (1 minute, 17 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-7-slash-postgres-11 Passed (1 minute, 25 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (13 minutes, 1 second)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (14 minutes, 25 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (14 minutes, 15 seconds)
Details
Homeserver Task Board automation moved this from Review to Done Nov 7, 2019
@anoadragon453 anoadragon453 deleted the anoa/room_upgrade_groups branch Nov 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
2 participants
You can’t perform that action at this time.