Commit 82673dac authored by Sebastien Robin's avatar Sebastien Robin

ERP5OOoDocument: use conversion server that has the most chance to work

Until know, in the preference we defined list of uri for conversion
server, and then we were trying always in the order defined in the
preference. But this is not optimal, when a server start to fail, it's
better to try using another one. So sort list of uri in such a way to
use first server having the most chance to work.
parent 8d3388d4
...@@ -49,6 +49,7 @@ from functools import partial ...@@ -49,6 +49,7 @@ from functools import partial
from Products.ERP5.mixin.base_convertable import BaseConvertableFileMixin from Products.ERP5.mixin.base_convertable import BaseConvertableFileMixin
from Products.ERP5.mixin.text_convertable import TextConvertableMixin from Products.ERP5.mixin.text_convertable import TextConvertableMixin
from Products.ERP5.mixin.extensible_traversable import OOoDocumentExtensibleTraversableMixin from Products.ERP5.mixin.extensible_traversable import OOoDocumentExtensibleTraversableMixin
from DateTime import DateTime
# connection plugins # connection plugins
from Products.ERP5Type.ConnectionPlugin.TimeoutTransport import TimeoutTransport from Products.ERP5Type.ConnectionPlugin.TimeoutTransport import TimeoutTransport
...@@ -61,6 +62,10 @@ EMBEDDED_FORMAT = '_embedded' ...@@ -61,6 +62,10 @@ EMBEDDED_FORMAT = '_embedded'
OOO_SERVER_PROXY_TIMEOUT = 360 OOO_SERVER_PROXY_TIMEOUT = 360
OOO_SERVER_RETRY = 0 OOO_SERVER_RETRY = 0
# store time (as int) where we had last failure in order
# to try using proxy server that worked the most recently
global_server_proxy_uri_failure_time = {}
class OOoServerProxy(): class OOoServerProxy():
""" """
xmlrpc-like ServerProxy object adapted for OOo conversion server xmlrpc-like ServerProxy object adapted for OOo conversion server
...@@ -95,7 +100,8 @@ class OOoServerProxy(): ...@@ -95,7 +100,8 @@ class OOoServerProxy():
transport = TimeoutTransport(timeout=timeout, scheme=scheme) transport = TimeoutTransport(timeout=timeout, scheme=scheme)
self._serverproxy_list.append(ServerProxy(uri, allow_none=True, transport=transport)) self._serverproxy_list.append((uri, ServerProxy(uri, allow_none=True, transport=transport)))
def _proxy_function(self, func_name, *args, **kw): def _proxy_function(self, func_name, *args, **kw):
result_error_set_list = [] result_error_set_list = []
protocol_error_list = [] protocol_error_list = []
...@@ -103,10 +109,13 @@ class OOoServerProxy(): ...@@ -103,10 +109,13 @@ class OOoServerProxy():
fault_error_list = [] fault_error_list = []
count = 0 count = 0
serverproxy_list = self._serverproxy_list serverproxy_list = self._serverproxy_list
# we have list of tuple (uri, ServerProxy()). Sort by uri having oldest failure
serverproxy_list.sort(key=lambda x: global_server_proxy_uri_failure_time.get(x[0], 0))
while True: while True:
retry_server_list = [] retry_server_list = []
for server_proxy in serverproxy_list: for uri, server_proxy in serverproxy_list:
func = getattr(server_proxy, func_name) func = getattr(server_proxy, func_name)
failure = True
try: try:
# Cloudooo return result in (200 or 402, dict(), '') format or just based type # Cloudooo return result in (200 or 402, dict(), '') format or just based type
# 402 for error and 200 for ok # 402 for error and 200 for ok
...@@ -114,32 +123,36 @@ class OOoServerProxy(): ...@@ -114,32 +123,36 @@ class OOoServerProxy():
except SocketError, e: except SocketError, e:
message = 'Socket Error: %s' % (repr(e) or 'undefined.') message = 'Socket Error: %s' % (repr(e) or 'undefined.')
socket_error_list.append(message) socket_error_list.append(message)
retry_server_list.append(server_proxy) retry_server_list.append((uri, server_proxy))
continue
except ProtocolError, e: except ProtocolError, e:
# Network issue # Network issue
message = "%s: %s %s" % (e.url, e.errcode, e.errmsg) message = "%s: %s %s" % (e.url, e.errcode, e.errmsg)
if e.errcode == -1: if e.errcode == -1:
message = "%s: Connection refused" % (e.url) message = "%s: Connection refused" % (e.url)
protocol_error_list.append(message) protocol_error_list.append(message)
retry_server_list.append(server_proxy) retry_server_list.append((uri, server_proxy))
continue
except Fault, e: except Fault, e:
# Return not supported data types # Return not supported data types
fault_error_list.append(e) fault_error_list.append(e)
continue
try:
response_code, response_dict, response_message = result_set
except ValueError:
# Compatibility for old oood, result is based type, like string
response_code = 200
if response_code == 200:
return result_set
else: else:
# If error, try next one failure = False
result_error_set_list.append(result_set)
if not(failure):
try:
response_code, response_dict, response_message = result_set
except ValueError:
# Compatibility for old oood, result is based type, like string
response_code = 200
if response_code == 200:
return result_set
else:
# If error, try next one
result_error_set_list.append(result_set)
# Still there ? this means we had no result,
# avoid using same server again
global_server_proxy_uri_failure_time[uri] = int(DateTime())
# All servers are failed # All servers are failed
if count == self._ooo_server_retry or len(retry_server_list) == 0: if count == self._ooo_server_retry or len(retry_server_list) == 0:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment