From f7bd2ffd27dc72b3be82e7452a6d2ed1060bbf7d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 18 Sep 2019 10:00:23 +0100 Subject: [PATCH 1/3] Undo the deletion of some tables This is a partial revert of #5893. The problem is that if we drop these tables in the same release as removing the code that writes to them, it prevents users users from being able to roll back to a previous release. So let's leave the tables in place for now, and remember to drop them in a subsequent release. (Note that these tables haven't been *read* for *years*, so any missing rows resulting from a temporary upgrade to vNext won't cause a problem.) --- changelog.d/6047.misc | 1 + .../delta/56/drop_unused_event_tables.sql | 20 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) create mode 100644 changelog.d/6047.misc delete mode 100644 synapse/storage/schema/delta/56/drop_unused_event_tables.sql diff --git a/changelog.d/6047.misc b/changelog.d/6047.misc new file mode 100644 index 000000000000..07ee4888dc21 --- /dev/null +++ b/changelog.d/6047.misc @@ -0,0 +1 @@ +Drop some unused tables. diff --git a/synapse/storage/schema/delta/56/drop_unused_event_tables.sql b/synapse/storage/schema/delta/56/drop_unused_event_tables.sql deleted file mode 100644 index 9f09922c677d..000000000000 --- a/synapse/storage/schema/delta/56/drop_unused_event_tables.sql +++ /dev/null @@ -1,20 +0,0 @@ -/* 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. - */ - --- these tables are never used. -DROP TABLE IF EXISTS room_names; -DROP TABLE IF EXISTS topics; -DROP TABLE IF EXISTS history_visibility; -DROP TABLE IF EXISTS guest_access; From 7478fa4e45d64d0b1f77fbc9ef4c9f8912919e6d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 18 Sep 2019 10:23:42 +0100 Subject: [PATCH 2/3] fix changelogs --- changelog.d/5893.misc | 2 +- changelog.d/6047.misc | 3 ++- synapse/config/registration.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changelog.d/5893.misc b/changelog.d/5893.misc index 07ee4888dc21..5ef171cb3efa 100644 --- a/changelog.d/5893.misc +++ b/changelog.d/5893.misc @@ -1 +1 @@ -Drop some unused tables. +Stop populating some unused tables. diff --git a/changelog.d/6047.misc b/changelog.d/6047.misc index 07ee4888dc21..a4cdb8abb399 100644 --- a/changelog.d/6047.misc +++ b/changelog.d/6047.misc @@ -1 +1,2 @@ -Drop some unused tables. +Stop populating some unused tables. + diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 9548560edb10..f8333ca53f0f 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -96,7 +96,7 @@ def read_config(self, config, **kwargs): self.registration_shared_secret = config.get("registration_shared_secret") self.bcrypt_rounds = config.get("bcrypt_rounds", 12) - self.trusted_third_party_id_servers = config.get( + self.trusted_third_party_id_serverstrusted_third_party_id_servers = config.get( "trusted_third_party_id_servers", ["matrix.org", "vector.im"] ) account_threepid_delegates = config.get("account_threepid_delegates") or {} From d04013ab6c06308baa464d2628449756c8b6d4c8 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Thu, 19 Sep 2019 12:28:17 +0100 Subject: [PATCH 3/3] Update synapse/config/registration.py Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> --- synapse/config/registration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/config/registration.py b/synapse/config/registration.py index f8333ca53f0f..9548560edb10 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -96,7 +96,7 @@ def read_config(self, config, **kwargs): self.registration_shared_secret = config.get("registration_shared_secret") self.bcrypt_rounds = config.get("bcrypt_rounds", 12) - self.trusted_third_party_id_serverstrusted_third_party_id_servers = config.get( + self.trusted_third_party_id_servers = config.get( "trusted_third_party_id_servers", ["matrix.org", "vector.im"] ) account_threepid_delegates = config.get("account_threepid_delegates") or {}