Merge commit '4c37d2acd' into anoa/dinsic_release_1_31_0
3 files changed, 22 insertions, 10 deletions
diff --git a/CHANGES.md b/CHANGES.md
index fa6c67489f..608965040d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,10 @@
Synapse 1.26.0rc1 (2021-01-20)
==============================
+This release brings a new schema version for Synapse and rolling back to a previous
+verious is not trivial. Please review [UPGRADE.rst](UPGRADE.rst) for more details
+on these changes and for general upgrade guidance.
+
Features
--------
diff --git a/README.rst b/README.rst
index af914d71a8..d872b11f57 100644
--- a/README.rst
+++ b/README.rst
@@ -286,7 +286,7 @@ We recommend using the demo which starts 3 federated instances running on ports
(to stop, you can use `./demo/stop.sh`)
-If you just want to start a single instance of the app and run it directly:
+If you just want to start a single instance of the app and run it directly::
# Create the homeserver.yaml config once
python -m synapse.app.homeserver \
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 706701ec59..d09dbd4e21 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -104,25 +104,33 @@ back to v1.25.0 you need to:
UPDATE schema_version SET version = 58;
-3. Delete the ignored users data:
+3. Delete the ignored users & chain cover data:
- If using PostgreSQL:
+ .. code:: sql
+
+ DROP TABLE IF EXISTS ignored_users;
+ UPDATE rooms SET has_auth_chain_index = false;
+
+ For PostgreSQL run:
- .. code:: sql
+ .. code:: sql
- TRUNCATE TABLE ignored_users;
+ TRUNCATE event_auth_chain_links;
+ TRUNCATE event_auth_chains;
- If using SQLite:
+ For SQLite run:
- .. code:: sql
+ .. code:: sql
- DELETE FROM ignored_users;
+ DELETE FROM event_auth_chain_links;
+ DELETE FROM event_auth_chains;
-4. Mark the ignored user delta as not run (so it will re-run on upgrade).
+4. Mark the deltas as not run (so they will re-run on upgrade).
- .. code:: sql
+ .. code:: sql
DELETE FROM applied_schema_deltas WHERE version = 59 AND file = "59/01ignored_user.py";
+ DELETE FROM applied_schema_deltas WHERE version = 59 AND file = "59/06chain_cover_index.sql";
5. Downgrade Synapse by following the instructions for your installation method
in the "Rolling back to older versions" section above.
|
