This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Populate the room version from state events #7070
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Repair a data-corruption issue which was introduced in Synapse 1.10, and fixed in Synapse 1.11, and which could cause `/sync` to return with 404 errors about missing events and unknown rooms. |
39 changes: 39 additions & 0 deletions
39
synapse/storage/data_stores/main/schema/delta/57/rooms_version_column_3.sql.postgres
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/* Copyright 2020 The Matrix.org Foundation C.I.C. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
-- When we first added the room_version column to the rooms table, it was populated from | ||
-- the current_state_events table. However, there was an issue causing a background | ||
-- update to clean up the current_state_events table for rooms where the server is no | ||
-- longer participating, before that column could be populated. Therefore, some rooms had | ||
-- a NULL room_version. | ||
|
||
-- The rooms_version_column_2.sql.* delta files were introduced to make the populating | ||
-- synchronous instead of running it in a background update, which fixed this issue. | ||
-- However, all of the instances of Synapse installed or updated in the meantime got | ||
-- their rooms table corrupted with NULL room_versions. | ||
|
||
-- This query fishes out the room versions from the create event using the state_events | ||
-- table instead of the current_state_events one, as the former still have all of the | ||
-- create events. | ||
|
||
UPDATE rooms SET room_version=( | ||
SELECT COALESCE(json::json->'content'->>'room_version','1') | ||
FROM state_events se INNER JOIN event_json ej USING (event_id) | ||
WHERE se.room_id=rooms.room_id AND se.type='m.room.create' AND se.state_key='' | ||
LIMIT 1 | ||
) WHERE rooms.room_version IS NULL; | ||
|
||
-- see also rooms_version_column_3.sql.sqlite which has a copy of the above query, using | ||
-- sqlite syntax for the json extraction. |
23 changes: 23 additions & 0 deletions
23
synapse/storage/data_stores/main/schema/delta/57/rooms_version_column_3.sql.sqlite
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/* Copyright 2020 The Matrix.org Foundation C.I.C. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
-- see rooms_version_column_3.sql.postgres for details of what's going on here. | ||
|
||
UPDATE rooms SET room_version=( | ||
SELECT COALESCE(json_extract(ej.json, '$.content.room_version'), '1') | ||
FROM state_events se INNER JOIN event_json ej USING (event_id) | ||
WHERE se.room_id=rooms.room_id AND se.type='m.room.create' AND se.state_key='' | ||
LIMIT 1 | ||
) WHERE rooms.room_version IS NULL; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a comment for my future self:
for rooms where we don't have the create event, this
select
will return zero rows, which will mean the update will setroom_version = NULL
. That should only happen for out-of-band invites, which are covered by https://github.com/matrix-org/synapse/pull/6874/files/9cbd27ba61e17106564389142ed11c73ed9eafb5#diff-a155dd33efb484b1f8324c754c6ee55cR596.