Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:16:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Store Promise<Response> instead of Response for HTTP API transactions

Browse source 
This fixes a race whereby:
 - User hits an endpoint.
 - No cached transaction so executes main code.
 - User hits same endpoint.
 - No cache transaction so executes main code.
 - Main code finishes executing and caches response and returns.
 - Main code finishes executing and caches response and returns.

 This race is common in the wild when Synapse is struggling under load.
 This commit fixes the race by:
  - User hits an endpoint.
  - Caches the promise to execute the main code and executes main code.
  - User hits same endpoint.
  - Yields on the same promise as the first request.
  - Main code finishes executing and returns, unblocking both requests.
This commit is contained in:
Kegan Dougal 2016-11-10 14:49:26 +00:00
parent 6cc4fcf25c
commit 2771447c29
4 changed files with 68 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

82
synapse/rest/client/v1/room.py
View file

@ -56,15 +56,15 @@ class RoomCreateRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks
def on_PUT(self, request, txn_id):
try:
defer.returnValue(
self.txns.get_client_transaction(request, txn_id)
)
res_deferred = self.txns.get_client_transaction(request, txn_id)
res = yield res_deferred
defer.returnValue(res)
except KeyError:
pass
response = yield self.on_POST(request)
self.txns.store_client_transaction(request, txn_id, response)
res_deferred = self.on_POST(request)
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred
defer.returnValue(response)
@defer.inlineCallbacks
@ -217,15 +217,15 @@ class RoomSendEventRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks
def on_PUT(self, request, room_id, event_type, txn_id):
try:
defer.returnValue(
self.txns.get_client_transaction(request, txn_id)
)
res_deferred = self.txns.get_client_transaction(request, txn_id)
res = yield res_deferred
defer.returnValue(res)
except KeyError:
pass
response = yield self.on_POST(request, room_id, event_type, txn_id)
self.txns.store_client_transaction(request, txn_id, response)
res_deferred = self.on_POST(request, room_id, event_type, txn_id)
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred
defer.returnValue(response)
@ -286,15 +286,15 @@ class JoinRoomAliasServlet(ClientV1RestServlet):
@defer.inlineCallbacks
def on_PUT(self, request, room_identifier, txn_id):
try:
defer.returnValue(
self.txns.get_client_transaction(request, txn_id)
)
res_deferred = self.txns.get_client_transaction(request, txn_id)
res = yield res_deferred
defer.returnValue(res)
except KeyError:
pass
response = yield self.on_POST(request, room_identifier, txn_id)
self.txns.store_client_transaction(request, txn_id, response)
res_deferred = self.on_POST(request, room_identifier, txn_id)
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred
defer.returnValue(response)
@ -540,17 +540,15 @@ class RoomForgetRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks
def on_PUT(self, request, room_id, txn_id):
try:
defer.returnValue(
self.txns.get_client_transaction(request, txn_id)
)
res_deferred = self.txns.get_client_transaction(request, txn_id)
res = yield res_deferred
defer.returnValue(res)
except KeyError:
pass
response = yield self.on_POST(
request, room_id, txn_id
)
self.txns.store_client_transaction(request, txn_id, response)
res_deferred = self.on_POST(request, room_id, txn_id)
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred
defer.returnValue(response)
@ -626,17 +624,15 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks
def on_PUT(self, request, room_id, membership_action, txn_id):
try:
defer.returnValue(
self.txns.get_client_transaction(request, txn_id)
)
res_deferred = self.txns.get_client_transaction(request, txn_id)
res = yield res_deferred
defer.returnValue(res)
except KeyError:
pass
response = yield self.on_POST(
request, room_id, membership_action, txn_id
)
self.txns.store_client_transaction(request, txn_id, response)
res_deferred = self.on_POST(request, room_id, membership_action, txn_id)
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred
defer.returnValue(response)
@ -672,15 +668,15 @@ class RoomRedactEventRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks
def on_PUT(self, request, room_id, event_id, txn_id):
try:
defer.returnValue(
self.txns.get_client_transaction(request, txn_id)
)
res_deferred = self.txns.get_client_transaction(request, txn_id)
res = yield res_deferred
defer.returnValue(res)
except KeyError:
pass
response = yield self.on_POST(request, room_id, event_id, txn_id)
self.txns.store_client_transaction(request, txn_id, response)
res_deferred = self.on_POST(request, room_id, event_id, txn_id)
self.txns.store_client_transaction(request, txn_id, res_deferred)
response = yield res_deferred
defer.returnValue(response)