maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

HTTP server: handle message resends

Browse source 
If a client gave up waiting for the server's response and resent its message
while the server was still processing the message, syncing failed with
"protocol error: already processing a message" raised by the
syncevo-dbus-server because it wasn't prepared to handle that situation.

The right place to handle this is inside the syncevo-http-server, because it
depends on the protocol (HTTP in this case) whether resending is valid or
not. It handles that now by tracking the message that is currently in
processing and matching it against each new message. If it matches, the new
request replaces the obsolete one without sending the message again to
syncevo-dbus-server. When syncevo-dbus-server replies to the old message, the
reply is used to finish the newer request.

This situation is covered by
Client::Sync::eds_event_eds_contact::testManyDeletes with 100 items and
client and server running under valgrind. The test failed earlier and works
now.
This commit is contained in:
Patrick Ohly 2013-07-10 03:53:47 -07:00
parent dc35d87dec
commit 4577c27fda
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
test/syncevo-http-server.py
View file

@ -115,6 +115,7 @@ class SyncMLSession:
def __init__(self):
self.sessionid = None
self.request = None
self.aborted_request = None
self.conpath = None
self.abort_match = None
self.reply_match = None
@ -192,6 +193,12 @@ class SyncMLSession:
def done(self, error):
'''lost connection to HTTP client, either normally or in error'''
logger.debug("done with request in session %s, error %s", self.sessionid, error)
# Keep request if client closed the connection, the client
# might be about to resend.
if error != None:
self.aborted_request = self.request
else:
self.aborted_request = None
# keep connection to syncevo-dbus-server, client might still
# retry the request
self.request = None
@ -252,16 +259,35 @@ class SyncMLSession:
'''process next message by client in running session'''
type = request.getHeader('content-type')
self.logMessage("incoming", request, data, type)
mustprocess = True
if self.request:
# message resend?! Ignore old request.
logger.debug("message resend?!")
# Message resend?! Ignore old, active request.
self.logMessage("new message while still processing one on active TCP connection", self.request, self.request.processingdata, self.request.processingtype)
self.request.finish()
if self.request.processingdata == data and self.request.processingtype == type:
logger.debug("is message resend, no need to process again")
mustprocess = False
else:
logger.debug("different message, send to syncevo-dbus-server")
self.request = None
if self.aborted_request != None:
# Message resend after closing connection and thus aborting the currently
# active request?
self.logMessage("new message after aborting the previous one", self.aborted_request, self.aborted_request.processingdata, self.aborted_request.processingtype)
if self.aborted_request.processingdata == data and self.aborted_request.processingtype == type:
logger.debug("is message resend, no need to process again")
mustprocess = False
else:
logger.debug("different message, send to syncevo-dbus-server")
self.aborted_request = None
deferred = request.notifyFinish()
deferred.addCallback(self.done)
deferred.addErrback(self.done)
self.request = request
self.connection.Process(data, type)
request.processingdata = data
request.processingtype = type
if mustprocess:
self.connection.Process(data, type)
def logMessage(self, direction, request, data, type):
if 'plain' in type or "+xml" in type: