diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-11-15 14:02:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 14:02:34 +0000 |
| commit | 657d614f6a53f3dbfd2858bd85d0f81563db0041 (patch) | |
| tree | 6ef5a4a9a9b3aaa14f0e80989c23445b59de3d38 | |
| parent | Add optional python dependencies to snap packaging (#6317) (diff) | |
| download | synapse-657d614f6a53f3dbfd2858bd85d0f81563db0041.tar.xz | |
Replace UPDATE with UPSERT on device_max_stream_id table (#6363)
| -rw-r--r-- | changelog.d/6363.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/deviceinbox.py | 17 |
2 files changed, 16 insertions, 2 deletions
diff --git a/changelog.d/6363.bugfix b/changelog.d/6363.bugfix new file mode 100644 index 0000000000..d023b49181 --- /dev/null +++ b/changelog.d/6363.bugfix @@ -0,0 +1 @@ +Fix `to_device` stream ID getting reset every time Synapse restarts, which had the potential to cause unable to decrypt errors. \ No newline at end of file diff --git a/synapse/storage/data_stores/main/deviceinbox.py b/synapse/storage/data_stores/main/deviceinbox.py index f04aad0743..96cd0fb77a 100644 --- a/synapse/storage/data_stores/main/deviceinbox.py +++ b/synapse/storage/data_stores/main/deviceinbox.py @@ -358,8 +358,21 @@ class DeviceInboxStore(DeviceInboxWorkerStore, DeviceInboxBackgroundUpdateStore) def _add_messages_to_local_device_inbox_txn( self, txn, stream_id, messages_by_user_then_device ): - sql = "UPDATE device_max_stream_id" " SET stream_id = ?" " WHERE stream_id < ?" - txn.execute(sql, (stream_id, stream_id)) + # 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,)) local_by_user_then_device = {} for user_id, messages_by_device in messages_by_user_then_device.items(): |