From da828675804e17e4af19141d7d7ff44706b83f61 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Fri, 17 May 2019 11:39:47 +0100 Subject: [PATCH 1/5] expose SlavedProfileStore to ClientReaderSlavedStore --- synapse/app/client_reader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index 864f1eac4826..707f7c2f078a 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -29,6 +29,7 @@ from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource +from synapse.replication.slave.storage import SlavedProfileStore from synapse.replication.slave.storage._base import BaseSlavedStore from synapse.replication.slave.storage.account_data import SlavedAccountDataStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore @@ -83,6 +84,7 @@ class ClientReaderSlavedStore( SlavedTransactionStore, SlavedClientIpStore, BaseSlavedStore, + SlavedProfileStore, ): pass From f0657ecef4d7833ce627be92a1689c7d1b23d846 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Fri, 17 May 2019 11:47:33 +0100 Subject: [PATCH 2/5] towncrier --- changelog.d/5200.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5200.bugfix diff --git a/changelog.d/5200.bugfix b/changelog.d/5200.bugfix new file mode 100644 index 000000000000..25e09129e1fa --- /dev/null +++ b/changelog.d/5200.bugfix @@ -0,0 +1 @@ +Fix worker registration bug caused by ClientReaderSlavedStore being unable to see get_profileinfo From 6306e89d1b41f65ebdea9c95b10110e87fa1b4b4 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Fri, 17 May 2019 12:03:26 +0100 Subject: [PATCH 3/5] towncrier --- changelog.d/5200.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/5200.bugfix b/changelog.d/5200.bugfix index 25e09129e1fa..f346c7b0cc8d 100644 --- a/changelog.d/5200.bugfix +++ b/changelog.d/5200.bugfix @@ -1 +1 @@ -Fix worker registration bug caused by ClientReaderSlavedStore being unable to see get_profileinfo +Fix worker registration bug caused by ClientReaderSlavedStore being unable to see get_profileinfo. From 4ad36e8935288604d19664b9473061970e24383d Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Mon, 20 May 2019 17:41:00 +0100 Subject: [PATCH 4/5] fix import path --- synapse/app/client_reader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index 707f7c2f078a..9dc15f474033 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -29,7 +29,6 @@ from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.replication.slave.storage import SlavedProfileStore from synapse.replication.slave.storage._base import BaseSlavedStore from synapse.replication.slave.storage.account_data import SlavedAccountDataStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore @@ -39,6 +38,7 @@ from synapse.replication.slave.storage.directory import DirectoryStore from synapse.replication.slave.storage.events import SlavedEventStore from synapse.replication.slave.storage.keys import SlavedKeyStore +from synapse.replication.slave.storage.profile import SlavedProfileStore from synapse.replication.slave.storage.push_rule import SlavedPushRuleStore from synapse.replication.slave.storage.receipts import SlavedReceiptsStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore From 8ccc47031bdb6cd467c069c0192d6a0f4a7f6fff Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 21 May 2019 14:25:08 +0100 Subject: [PATCH 5/5] Reorder subclass as otherwise inconsistent MRO --- synapse/app/client_reader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index 9dc15f474033..a16e037f3227 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -82,9 +82,9 @@ class ClientReaderSlavedStore( SlavedApplicationServiceStore, SlavedRegistrationStore, SlavedTransactionStore, + SlavedProfileStore, SlavedClientIpStore, BaseSlavedStore, - SlavedProfileStore, ): pass