diff options
| author | Erik Johnston <erikj@jki.re> | 2018-09-20 10:54:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 10:54:49 +0100 |
| commit | 3fd68d533bc97b198ffaac34aeb783108b281168 (patch) | |
| tree | 5da174e735399f0a89189c4875adb78bfc2973fb | |
| parent | Add a way to run tests in PostgreSQL in Docker (#3699) (diff) | |
| parent | Fix up changelog and remove spurious comment (diff) | |
| download | synapse-3fd68d533bc97b198ffaac34aeb783108b281168.tar.xz | |
Merge pull request #3914 from matrix-org/erikj/remove_retry_cache
Remove get_destination_retry_timings cache
| -rw-r--r-- | changelog.d/3914.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/transactions.py | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/changelog.d/3914.bugfix b/changelog.d/3914.bugfix new file mode 100644 index 0000000000..27e6bad590 --- /dev/null +++ b/changelog.d/3914.bugfix @@ -0,0 +1 @@ +Fix bug where outbound federation would stop talking to some servers when using workers diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py index 0c42bd3322..baf0379a68 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py @@ -23,7 +23,6 @@ from canonicaljson import encode_canonical_json from twisted.internet import defer from synapse.metrics.background_process_metrics import run_as_background_process -from synapse.util.caches.descriptors import cached from ._base import SQLBaseStore, db_to_json @@ -156,7 +155,6 @@ class TransactionStore(SQLBaseStore): """ pass - @cached(max_entries=10000) def get_destination_retry_timings(self, destination): """Gets the current retry timings (if any) for a given destination. @@ -198,8 +196,6 @@ class TransactionStore(SQLBaseStore): retry_interval (int) - how long until next retry in ms """ - # XXX: we could chose to not bother persisting this if our cache thinks - # this is a NOOP return self.runInteraction( "set_destination_retry_timings", self._set_destination_retry_timings, @@ -212,10 +208,6 @@ class TransactionStore(SQLBaseStore): retry_last_ts, retry_interval): self.database_engine.lock_table(txn, "destinations") - self._invalidate_cache_and_stream( - txn, self.get_destination_retry_timings, (destination,) - ) - # We need to be careful here as the data may have changed from under us # due to a worker setting the timings. |