From ef5f62099534b8d7f5d67a4019906bca3e57847f Mon Sep 17 00:00:00 2001 From: Sean Quah Date: Tue, 8 Nov 2022 11:13:17 +0000 Subject: [PATCH 1/5] Add PostgreSQL 10 deprecation notice to upgrade notes Signed-off-by: Sean Quah --- changelog.d/14392.doc | 1 + docs/upgrade.md | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 changelog.d/14392.doc diff --git a/changelog.d/14392.doc b/changelog.d/14392.doc new file mode 100644 index 000000000000..b4c719a2d0d8 --- /dev/null +++ b/changelog.d/14392.doc @@ -0,0 +1 @@ +Add PostgreSQL 10 deprecation notice to upgrade notes. diff --git a/docs/upgrade.md b/docs/upgrade.md index 41b06cc25347..2aa353e4962d 100644 --- a/docs/upgrade.md +++ b/docs/upgrade.md @@ -88,6 +88,16 @@ process, for example: dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb ``` +# Upgrading to v1.72.0 + +## Dropping support for PostgreSQL 10 + +In line with our [deprecation policy](deprecation_policy.md), we've dropped +support for PostgreSQL 10, as it is no longer supported upstream. + +This release of Synapse requires PostgreSQL 11+. + + # Upgrading to v1.71.0 ## Removal of the `generate_short_term_login_token` module API method From f69a492da9d43529d2a1387d1547fa15f8df5bc3 Mon Sep 17 00:00:00 2001 From: Sean Quah Date: Tue, 8 Nov 2022 14:13:27 +0000 Subject: [PATCH 2/5] Remove support for PostgreSQL 10 --- changelog.d/14392.doc | 1 - changelog.d/14392.misc | 1 + synapse/storage/engines/postgres.py | 5 +++-- 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/14392.doc create mode 100644 changelog.d/14392.misc diff --git a/changelog.d/14392.doc b/changelog.d/14392.doc deleted file mode 100644 index b4c719a2d0d8..000000000000 --- a/changelog.d/14392.doc +++ /dev/null @@ -1 +0,0 @@ -Add PostgreSQL 10 deprecation notice to upgrade notes. diff --git a/changelog.d/14392.misc b/changelog.d/14392.misc new file mode 100644 index 000000000000..e96b3de2bd87 --- /dev/null +++ b/changelog.d/14392.misc @@ -0,0 +1 @@ +Remove support for PostgreSQL 10. diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index 9bf74bbf5920..f432ba2b612a 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -81,8 +81,9 @@ def check_database( allow_unsafe_locale = self.config.get("allow_unsafe_locale", False) # Are we on a supported PostgreSQL version? - if not allow_outdated_version and self._version < 100000: - raise RuntimeError("Synapse requires PostgreSQL 10 or above.") + import pdb; pdb.set_trace() + if not allow_outdated_version and self._version < 110000: + raise RuntimeError("Synapse requires PostgreSQL 11 or above.") with db_conn.cursor() as txn: txn.execute("SHOW SERVER_ENCODING") From 29f84dfb98faed464e8a679b590633ad75b63325 Mon Sep 17 00:00:00 2001 From: Sean Quah Date: Tue, 8 Nov 2022 14:14:15 +0000 Subject: [PATCH 3/5] fixup: remove stray debugging --- synapse/storage/engines/postgres.py | 1 - 1 file changed, 1 deletion(-) diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index f432ba2b612a..0c4fd889147b 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -81,7 +81,6 @@ def check_database( allow_unsafe_locale = self.config.get("allow_unsafe_locale", False) # Are we on a supported PostgreSQL version? - import pdb; pdb.set_trace() if not allow_outdated_version and self._version < 110000: raise RuntimeError("Synapse requires PostgreSQL 11 or above.") From 11893ef69704c5f99646f4f78c7a429ed0876ec4 Mon Sep 17 00:00:00 2001 From: Sean Quah Date: Tue, 8 Nov 2022 15:20:19 +0000 Subject: [PATCH 4/5] Test against PostgreSQL 11 instead of PostgreSQL 10 in CI --- .ci/scripts/calculate_jobs.py | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/calculate_jobs.py b/.ci/scripts/calculate_jobs.py index c53d4d5ff128..b48174bea2dc 100755 --- a/.ci/scripts/calculate_jobs.py +++ b/.ci/scripts/calculate_jobs.py @@ -54,7 +54,7 @@ def set_output(key: str, value: str): { "python-version": "3.7", "database": "postgres", - "postgres-version": "10", + "postgres-version": "11", "extras": "all", } ] diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fea33abd12b4..2bc237a0ba6f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -409,7 +409,7 @@ jobs: matrix: include: - python-version: "3.7" - postgres-version: "10" + postgres-version: "11" - python-version: "3.11" postgres-version: "14" From 8ee921658bbe71c077be70e75fe27f13ae8c9119 Mon Sep 17 00:00:00 2001 From: Sean Quah Date: Tue, 8 Nov 2022 15:25:46 +0000 Subject: [PATCH 5/5] fixup: reclassify changelog as a removal --- changelog.d/{14392.misc => 14392.removal} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{14392.misc => 14392.removal} (100%) diff --git a/changelog.d/14392.misc b/changelog.d/14392.removal similarity index 100% rename from changelog.d/14392.misc rename to changelog.d/14392.removal