tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

fix a million stupid bugs and make it actually work

Browse source
This commit is contained in:
Matthew Hodgson 2014-12-08 19:34:51 +00:00
parent 0d3fa1ac6e
commit 8529fba02d
3 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
synapse/federation/replication.py
View file

@ -685,6 +685,7 @@ class _TransactionQueue(object):
self.transport_layer = transport_layer self.transport_layer = transport_layer
self._clock = hs.get_clock() self._clock = hs.get_clock()
self.store = hs.get_datastore()
# Is a mapping from destinations -> deferreds. Used to keep track # Is a mapping from destinations -> deferreds. Used to keep track
# of which destinations have transactions in flight and when they are # of which destinations have transactions in flight and when they are
@ -776,10 +777,17 @@ class _TransactionQueue(object):
@log_function @log_function
def _attempt_new_transaction(self, destination): def _attempt_new_transaction(self, destination):
(retry_last_ts, retry_interval) = self.store.get_destination_retry_timings(destination) (retry_last_ts, retry_interval) = (0, 0)
if retry_last_ts + retry_interval > int(self._clock.time_msec()): retry_timings = yield self.store.get_destination_retry_timings(destination)
logger.info("TX [%s] not ready for retry yet - dropping transaction for now") if retry_timings:
return (retry_last_ts, retry_interval) = (
retry_timings.retry_last_ts, retry_timings.retry_interval
)
if retry_last_ts + retry_interval > int(self._clock.time_msec()):
logger.info("TX [%s] not ready for retry yet - dropping transaction for now", destination)
return
else:
logger.info("TX [%s] is ready for retry", destination)
if destination in self.pending_transactions: if destination in self.pending_transactions:
# XXX: pending_transactions can get stuck on by a never-ending request # XXX: pending_transactions can get stuck on by a never-ending request
@ -866,7 +874,7 @@ class _TransactionQueue(object):
if code == 200: if code == 200:
if retry_last_ts: if retry_last_ts:
# this host is alive! reset retry schedule # this host is alive! reset retry schedule
self.store.set_destination_retry_timings(destination, 0, 0) yield self.store.set_destination_retry_timings(destination, 0, 0)
deferred.callback(None) deferred.callback(None)
else: else:
self.start_retrying(destination, retry_interval) self.start_retrying(destination, retry_interval)
@ -899,12 +907,13 @@ class _TransactionQueue(object):
# Check to see if there is anything else to send. # Check to see if there is anything else to send.
self._attempt_new_transaction(destination) self._attempt_new_transaction(destination)
@defer.inlineCallbacks
def start_retrying(self, destination, retry_interval): def start_retrying(self, destination, retry_interval):
# track that this destination is having problems and we should # track that this destination is having problems and we should
# give it a chance to recover before trying it again # give it a chance to recover before trying it again
if retry_interval: if retry_interval:
retry_interval *= 2 retry_interval *= 2
else: else:
retry_interval = 2 # try again at first after 2 seconds retry_interval = 2000 # try again at first after 2 seconds
self.store.set_destination_retry_timings(destination, yield self.store.set_destination_retry_timings(destination,
int(self._clock.time_msec()), retry_interval) int(self._clock.time_msec()), retry_interval)

3
synapse/handlers/federation.py
View file

@ -211,7 +211,8 @@ class FederationHandler(BaseHandler):
# if we're receiving valid events from an origin, # if we're receiving valid events from an origin,
# it's probably a good idea to mark it as not in retry-state # it's probably a good idea to mark it as not in retry-state
# for sending (although this is a bit of a leap) # for sending (although this is a bit of a leap)
if ((self.store.get_destination_retry_timings(origin))[0]): retry_timings = yield self.store.get_destination_retry_timings(origin)
if (retry_timings and retry_timings.retry_last_ts):
self.store.set_destination_retry_timings(origin, 0, 0) self.store.set_destination_retry_timings(origin, 0, 0)
room = yield self.store.get_room(event.room_id) room = yield self.store.get_room(event.room_id)

25
synapse/storage/transactions.py
View file

@ -17,6 +17,8 @@ from ._base import SQLBaseStore, Table
from collections import namedtuple from collections import namedtuple
from twisted.internet import defer
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -218,8 +220,8 @@ class TransactionStore(SQLBaseStore):
None if not retrying None if not retrying
Otherwise a DestinationsTable.EntryType for the retry scheme Otherwise a DestinationsTable.EntryType for the retry scheme
""" """
if self.destination_retry_cache[destination]: if destination in self.destination_retry_cache:
return self.destination_retry_cache[destination] return defer.succeed(self.destination_retry_cache[destination])
return self.runInteraction( return self.runInteraction(
"get_destination_retry_timings", "get_destination_retry_timings",
@ -228,11 +230,13 @@ class TransactionStore(SQLBaseStore):
def _get_destination_retry_timings(cls, txn, destination): def _get_destination_retry_timings(cls, txn, destination):
query = DestinationsTable.select_statement("destination = ?") query = DestinationsTable.select_statement("destination = ?")
txn.execute(query, (destination,)) txn.execute(query, (destination,))
result = DestinationsTable.decode_single_result(txn.fetchone()) result = txn.fetchall()
if result and result.retry_last_ts > 0: if result:
return result result = DestinationsTable.decode_single_result(result)
else: if result.retry_last_ts > 0:
return None return result
else:
return None
def set_destination_retry_timings(self, destination, retry_last_ts, retry_interval): def set_destination_retry_timings(self, destination, retry_last_ts, retry_interval):
"""Sets the current retry timings for a given destination. """Sets the current retry timings for a given destination.
@ -257,12 +261,11 @@ class TransactionStore(SQLBaseStore):
query = ( query = (
"INSERT OR REPLACE INTO %s " "INSERT OR REPLACE INTO %s "
"(retry_last_ts, retry_interval) " "(destination, retry_last_ts, retry_interval) "
"VALUES (?, ?) " "VALUES (?, ?, ?) "
"WHERE destination = ?"
) % DestinationsTable.table_name ) % DestinationsTable.table_name
txn.execute(query, (retry_last_ts, retry_interval, destination)) txn.execute(query, (destination, retry_last_ts, retry_interval))
def get_destinations_needing_retry(self): def get_destinations_needing_retry(self):
"""Get all destinations which are due a retry for sending a transaction. """Get all destinations which are due a retry for sending a transaction.