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

Commit 0ef321f

Browse files
authored
Remove outdated constraint on remote_media_cache_thumbnails (#9725)
The `remote_media_cache_thumbnails_media_origin_media_id_thumbna_key` constraint is superceded by `remote_media_repository_thumbn_media_origin_id_width_height_met` (which adds `thumbnail_method` to the unique key). PR #7124 made an attempt to remove the old constraint, but got the name wrong, so it didn't work. Here we update the bg update and rerun it. Fixes #8649.
1 parent 5688a74 commit 0ef321f

File tree

3 files changed

+41
-3
lines changed

3 files changed

+41
-3
lines changed

changelog.d/9725.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix longstanding bug which caused `duplicate key value violates unique constraint "remote_media_cache_thumbnails_media_origin_media_id_thumbna_key"` errors.

synapse/storage/databases/main/media_repository.py

+18-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
BG_UPDATE_REMOVE_MEDIA_REPO_INDEX_WITHOUT_METHOD = (
2323
"media_repository_drop_index_wo_method"
2424
)
25+
BG_UPDATE_REMOVE_MEDIA_REPO_INDEX_WITHOUT_METHOD_2 = (
26+
"media_repository_drop_index_wo_method_2"
27+
)
2528

2629

2730
class MediaSortOrder(Enum):
@@ -85,23 +88,35 @@ def __init__(self, database: DatabasePool, db_conn, hs):
8588
unique=True,
8689
)
8790

91+
# the original impl of _drop_media_index_without_method was broken (see
92+
# https://github.com/matrix-org/synapse/issues/8649), so we replace the original
93+
# impl with a no-op and run the fixed migration as
94+
# media_repository_drop_index_wo_method_2.
95+
self.db_pool.updates.register_noop_background_update(
96+
BG_UPDATE_REMOVE_MEDIA_REPO_INDEX_WITHOUT_METHOD
97+
)
8898
self.db_pool.updates.register_background_update_handler(
89-
BG_UPDATE_REMOVE_MEDIA_REPO_INDEX_WITHOUT_METHOD,
99+
BG_UPDATE_REMOVE_MEDIA_REPO_INDEX_WITHOUT_METHOD_2,
90100
self._drop_media_index_without_method,
91101
)
92102

93103
async def _drop_media_index_without_method(self, progress, batch_size):
104+
"""background update handler which removes the old constraints.
105+
106+
Note that this is only run on postgres.
107+
"""
108+
94109
def f(txn):
95110
txn.execute(
96111
"ALTER TABLE local_media_repository_thumbnails DROP CONSTRAINT IF EXISTS local_media_repository_thumbn_media_id_thumbnail_width_thum_key"
97112
)
98113
txn.execute(
99-
"ALTER TABLE remote_media_cache_thumbnails DROP CONSTRAINT IF EXISTS remote_media_repository_thumbn_media_id_thumbnail_width_thum_key"
114+
"ALTER TABLE remote_media_cache_thumbnails DROP CONSTRAINT IF EXISTS remote_media_cache_thumbnails_media_origin_media_id_thumbna_key"
100115
)
101116

102117
await self.db_pool.runInteraction("drop_media_indices_without_method", f)
103118
await self.db_pool.updates._end_background_update(
104-
BG_UPDATE_REMOVE_MEDIA_REPO_INDEX_WITHOUT_METHOD
119+
BG_UPDATE_REMOVE_MEDIA_REPO_INDEX_WITHOUT_METHOD_2
105120
)
106121
return 1
107122

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/* Copyright 2021 The Matrix.org Foundation C.I.C
2+
*
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
-- drop old constraints on remote_media_cache_thumbnails
17+
--
18+
-- This was originally part of 57.07, but it was done wrong, per
19+
-- https://github.com/matrix-org/synapse/issues/8649, so we do it again.
20+
INSERT INTO background_updates (ordering, update_name, progress_json, depends_on) VALUES
21+
(5911, 'media_repository_drop_index_wo_method_2', '{}', 'remote_media_repository_thumbnails_method_idx');
22+

0 commit comments

Comments
 (0)