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

Code style.

Browse source
This commit is contained in:
Erik Johnston 2014-12-10 10:16:09 +00:00
parent 71da2bed55
commit b8d30899b1
3 changed files with 85 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
synapse/federation/replication.py
View file

@ -728,7 +728,7 @@ class _TransactionQueue(object):
self.pending_pdus_by_dest.setdefault(destination, []).append( self.pending_pdus_by_dest.setdefault(destination, []).append(
(pdu, deferred, order) (pdu, deferred, order)
) )
def eb(failure): def eb(failure):
if not deferred.called: if not deferred.called:
deferred.errback(failure) deferred.errback(failure)
@ -745,7 +745,7 @@ class _TransactionQueue(object):
# NO inlineCallbacks # NO inlineCallbacks
def enqueue_edu(self, edu): def enqueue_edu(self, edu):
destination = edu.destination destination = edu.destination
if destination == self.server_name: if destination == self.server_name:
return return
@ -776,7 +776,7 @@ class _TransactionQueue(object):
) )
yield deferred yield deferred
@defer.inlineCallbacks @defer.inlineCallbacks
@log_function @log_function
def _attempt_new_transaction(self, destination): def _attempt_new_transaction(self, destination):
@ -790,12 +790,15 @@ class _TransactionQueue(object):
retry_timings.retry_last_ts, retry_timings.retry_interval retry_timings.retry_last_ts, retry_timings.retry_interval
) )
if retry_last_ts + retry_interval > int(self._clock.time_msec()): if retry_last_ts + retry_interval > int(self._clock.time_msec()):
logger.info("TX [%s] not ready for retry yet - " logger.info(
"dropping transaction for now", destination) "TX [%s] not ready for retry yet - "
"dropping transaction for now",
destination,
)
return return
else: else:
logger.info("TX [%s] is ready for retry", destination) 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 # XXX: pending_transactions can get stuck on by a never-ending
# request at which point pending_pdus_by_dest just keeps growing. # request at which point pending_pdus_by_dest just keeps growing.
@ -811,10 +814,14 @@ class _TransactionQueue(object):
if not pending_pdus and not pending_edus and not pending_failures: if not pending_pdus and not pending_edus and not pending_failures:
return return
logger.debug("TX [%s] Attempting new transaction " logger.debug(
"(pdus: %d, edus: %d, failures: %d)", "TX [%s] Attempting new transaction "
"(pdus: %d, edus: %d, failures: %d)",
destination, destination,
len(pending_pdus), len(pending_edus), len(pending_failures)) len(pending_pdus),
len(pending_edus),
len(pending_failures)
)
# Sort based on the order field # Sort based on the order field
pending_pdus.sort(key=lambda t: t[2]) pending_pdus.sort(key=lambda t: t[2])
@ -847,8 +854,11 @@ class _TransactionQueue(object):
yield self.transaction_actions.prepare_to_send(transaction) yield self.transaction_actions.prepare_to_send(transaction)
logger.debug("TX [%s] Persisted transaction", destination) logger.debug("TX [%s] Persisted transaction", destination)
logger.info("TX [%s] Sending transaction [%s]", destination, logger.info(
transaction.transaction_id) "TX [%s] Sending transaction [%s]",
destination,
transaction.transaction_id,
)
# Actually send the transaction # Actually send the transaction
@ -905,11 +915,14 @@ class _TransactionQueue(object):
except Exception as e: except Exception as e:
# We capture this here as there as nothing actually listens # We capture this here as there as nothing actually listens
# for this finishing functions deferred. # for this finishing functions deferred.
logger.warn("TX [%s] Problem in _attempt_transaction: %s", logger.warn(
destination, e) "TX [%s] Problem in _attempt_transaction: %s",
destination,
e,
)
self.set_retrying(destination, retry_interval) self.set_retrying(destination, retry_interval)
for deferred in deferreds: for deferred in deferreds:
if not deferred.called: if not deferred.called:
deferred.errback(e) deferred.errback(e)
@ -925,12 +938,17 @@ class _TransactionQueue(object):
def set_retrying(self, destination, retry_interval): def set_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
# plateau at hourly retries for now # plateau at hourly retries for now
if retry_interval >= 60 * 60 * 1000: if retry_interval >= 60 * 60 * 1000:
retry_interval = 60 * 60 * 1000 retry_interval = 60 * 60 * 1000
else: else:
retry_interval = 2000 # try again at first after 2 seconds retry_interval = 2000 # try again at first after 2 seconds
yield self.store.set_destination_retry_timings(destination,
int(self._clock.time_msec()), retry_interval) yield self.store.set_destination_retry_timings(
destination,
int(self._clock.time_msec()),
retry_interval
)

29
synapse/http/matrixfederationclient.py
View file

@ -130,12 +130,20 @@ class MatrixFederationHttpClient(object):
break break
except Exception as e: except Exception as e:
if not retry_on_dns_fail and isinstance(e, DNSLookupError): if not retry_on_dns_fail and isinstance(e, DNSLookupError):
logger.warn("DNS Lookup failed to %s with %s", destination, logger.warn(
e) "DNS Lookup failed to %s with %s",
destination,
e
)
raise SynapseError(400, "Domain specified not found.") raise SynapseError(400, "Domain specified not found.")
logger.warn("Sending request failed to %s: %s %s : %s", logger.warn(
destination, method, url_bytes, e) "Sending request failed to %s: %s %s : %s",
destination,
method,
url_bytes,
e
)
_print_ex(e) _print_ex(e)
if retries_left: if retries_left:
@ -144,10 +152,15 @@ class MatrixFederationHttpClient(object):
else: else:
raise raise
logger.info("Received response %d %s for %s: %s %s", logger.info(
response.code, response.phrase, "Received response %d %s for %s: %s %s",
destination, method, url_bytes) response.code,
response.phrase,
destination,
method,
url_bytes
)
if 200 <= response.code < 300: if 200 <= response.code < 300:
# We need to update the transactions table to say it was sent? # We need to update the transactions table to say it was sent?
pass pass

50
synapse/storage/transactions.py
View file

@ -27,7 +27,7 @@ logger = logging.getLogger(__name__)
class TransactionStore(SQLBaseStore): class TransactionStore(SQLBaseStore):
"""A collection of queries for handling PDUs. """A collection of queries for handling PDUs.
""" """
# a write-through cache of DestinationsTable.EntryType indexed by # a write-through cache of DestinationsTable.EntryType indexed by
# destination string # destination string
destination_retry_cache = {} destination_retry_cache = {}
@ -213,21 +213,21 @@ class TransactionStore(SQLBaseStore):
def get_destination_retry_timings(self, destination): def get_destination_retry_timings(self, destination):
"""Gets the current retry timings (if any) for a given destination. """Gets the current retry timings (if any) for a given destination.
Args: Args:
destination (str) destination (str)
Returns: Returns:
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 destination in self.destination_retry_cache: if destination in self.destination_retry_cache:
return defer.succeed(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",
self._get_destination_retry_timings, destination) self._get_destination_retry_timings, destination)
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,))
@ -238,30 +238,36 @@ class TransactionStore(SQLBaseStore):
return result return result
else: else:
return None return None
def set_destination_retry_timings(self, destination, def set_destination_retry_timings(self, destination,
retry_last_ts, retry_interval): retry_last_ts, retry_interval):
"""Sets the current retry timings for a given destination. """Sets the current retry timings for a given destination.
Both timings should be zero if retrying is no longer occuring. Both timings should be zero if retrying is no longer occuring.
Args: Args:
destination (str) destination (str)
retry_last_ts (int) - time of last retry attempt in unix epoch ms retry_last_ts (int) - time of last retry attempt in unix epoch ms
retry_interval (int) - how long until next retry in ms retry_interval (int) - how long until next retry in ms
""" """
self.destination_retry_cache[destination] = ( self.destination_retry_cache[destination] = (
DestinationsTable.EntryType(destination, DestinationsTable.EntryType(
retry_last_ts, retry_interval) destination,
retry_last_ts,
retry_interval
)
) )
# XXX: we could chose to not bother persisting this if our cache thinks # XXX: we could chose to not bother persisting this if our cache thinks
# this is a NOOP # this is a NOOP
return self.runInteraction( return self.runInteraction(
"set_destination_retry_timings", "set_destination_retry_timings",
self._set_destination_retry_timings, destination, self._set_destination_retry_timings,
retry_last_ts, retry_interval) destination,
retry_last_ts,
retry_interval,
)
def _set_destination_retry_timings(cls, txn, destination, def _set_destination_retry_timings(cls, txn, destination,
retry_last_ts, retry_interval): retry_last_ts, retry_interval):
@ -275,21 +281,22 @@ class TransactionStore(SQLBaseStore):
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.
Returns: Returns:
list: A list of `DestinationsTable.EntryType` list: A list of `DestinationsTable.EntryType`
""" """
return self.runInteraction( return self.runInteraction(
"get_destinations_needing_retry", "get_destinations_needing_retry",
self._get_destinations_needing_retry self._get_destinations_needing_retry
) )
def _get_destinations_needing_retry(cls, txn): def _get_destinations_needing_retry(cls, txn):
where = "retry_last_ts > 0 and retry_next_ts < now()" where = "retry_last_ts > 0 and retry_next_ts < now()"
query = DestinationsTable.select_statement(where) query = DestinationsTable.select_statement(where)
txn.execute(query) txn.execute(query)
return DestinationsTable.decode_results(txn.fetchall()) return DestinationsTable.decode_results(txn.fetchall())
class ReceivedTransactionsTable(Table): class ReceivedTransactionsTable(Table):
table_name = "received_transactions" table_name = "received_transactions"
@ -332,14 +339,15 @@ class TransactionsToPduTable(Table):
] ]
EntryType = namedtuple("TransactionsToPduEntry", fields) EntryType = namedtuple("TransactionsToPduEntry", fields)
class DestinationsTable(Table): class DestinationsTable(Table):
table_name = "destinations" table_name = "destinations"
fields = [ fields = [
"destination", "destination",
"retry_last_ts", "retry_last_ts",
"retry_interval", "retry_interval",
] ]
EntryType = namedtuple("DestinationsEntry", fields) EntryType = namedtuple("DestinationsEntry", fields)