Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add delta file to fix missing default table data #6555

Merged
merged 4 commits into from
Dec 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6555.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix missing row in device_max_stream_id that could cause unable to decrypt errors after server restart.
17 changes: 2 additions & 15 deletions synapse/storage/data_stores/main/deviceinbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,21 +358,8 @@ def add_messages_txn(txn, now_ms, stream_id):
def _add_messages_to_local_device_inbox_txn(
self, txn, stream_id, messages_by_user_then_device
):
# Compatible method of performing an upsert
sql = "SELECT stream_id FROM device_max_stream_id"

txn.execute(sql)
rows = txn.fetchone()
if rows:
db_stream_id = rows[0]
if db_stream_id < stream_id:
# Insert the new stream_id
sql = "UPDATE device_max_stream_id SET stream_id = ?"
else:
# No rows, perform an insert
sql = "INSERT INTO device_max_stream_id (stream_id) VALUES (?)"

txn.execute(sql, (stream_id,))
sql = "UPDATE device_max_stream_id" " SET stream_id = ?" " WHERE stream_id < ?"
txn.execute(sql, (stream_id, stream_id))

local_by_user_then_device = {}
for user_id, messages_by_device in messages_by_user_then_device.items():
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* Copyright 2019 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.
*/

-- This line already existed in deltas/35/device_stream_id but was not included in the
-- 54 full schema SQL. Add some SQL here to insert the missing row if it does not exist
INSERT INTO device_max_stream_id (stream_id) SELECT 0 WHERE NOT EXISTS (
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
SELECT * from device_max_stream_id
);
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ INSERT INTO federation_stream_position (type, stream_id) SELECT 'events', coales
INSERT INTO user_directory_stream_pos (stream_id) VALUES (0);
INSERT INTO stats_stream_pos (stream_id) VALUES (0);
INSERT INTO event_push_summary_stream_ordering (stream_ordering) VALUES (0);
-- device_max_stream_id is handled separately in 56/device_stream_id_insert.sql