From 9a794f7ecf5cd7e9d83a79857b1a7e0ce6d320b5 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 24 Feb 2021 11:41:06 +0000
Subject: [PATCH 1/2] Add SQL delta for deleting stale pushers

---
 .../delta/59/08delete_stale_pushers.sql       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 synapse/storage/databases/main/schema/delta/59/08delete_stale_pushers.sql

diff --git a/synapse/storage/databases/main/schema/delta/59/08delete_stale_pushers.sql b/synapse/storage/databases/main/schema/delta/59/08delete_stale_pushers.sql
new file mode 100644
index 000000000000..2442eea6bc92
--- /dev/null
+++ b/synapse/storage/databases/main/schema/delta/59/08delete_stale_pushers.sql
@@ -0,0 +1,19 @@
+/* Copyright 2021 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.
+ */
+
+
+-- Delete all pushers associated with deleted devices. This is to clear up after
+-- a bug where they weren't correctly deleted when using workers.
+DELETE FROM pushers WHERE access_token NOT IN (SELECT id FROM access_tokens);

From 30d8ed5ad91c31ac86b83b481df177f8cf0e2da0 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 24 Feb 2021 11:46:32 +0000
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/9479.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/9479.bugfix

diff --git a/changelog.d/9479.bugfix b/changelog.d/9479.bugfix
new file mode 100644
index 000000000000..2ab4f315c11f
--- /dev/null
+++ b/changelog.d/9479.bugfix
@@ -0,0 +1 @@
+Fix deleting pushers when using sharded pushers.