Commit 3ae6ff6d authored by Jim Fulton's avatar Jim Fulton Committed by GitHub

Merge pull request #61 from zopefoundation/ClientDisconnected-is-transient

Client disconnect errors are now transient errors.

Apparently, travis doesn't want to test this branch. :(
parents a07f8af3 5a927e27
language: python language: python
sudo: false sudo: false
cache:
pip
directories:
- eggs
matrix: matrix:
include: include:
- os: linux - os: linux
...@@ -24,9 +28,8 @@ matrix: ...@@ -24,9 +28,8 @@ matrix:
python: 3.5 python: 3.5
env: ZEO4_SERVER=1 env: ZEO4_SERVER=1
install: install:
- pip install -U setuptools - pip install -U zc.buildout
- python bootstrap.py - buildout
- bin/buildout
script: script:
- bin/test -v1j99 - bin/test -v1j99
notifications: notifications:
......
Changelog Changelog
========= =========
- Client disconnect errors are now transient errors. When
applications retry jobs that raise transient errors, jobs (e.g. web
requests) with disconnect errors will be retried. Together with
blocking synchronous ZEO server calls for a limited time while
disconnected, this change should allow brief disconnections due to
server restart to avoid generating client-visible errors (e.g. 500
web responses).
- Fixed bugs in using the ZEO 5 client with ZEO 4 servers. - Fixed bugs in using the ZEO 5 client with ZEO 4 servers.
5.0.0a2 (2016-07-30) 5.0.0a2 (2016-07-30)
......
...@@ -13,19 +13,26 @@ ...@@ -13,19 +13,26 @@
############################################################################## ##############################################################################
"""Exceptions for ZEO.""" """Exceptions for ZEO."""
import transaction.interfaces
from ZODB.POSException import StorageError from ZODB.POSException import StorageError
class ClientStorageError(StorageError): class ClientStorageError(StorageError):
"""An error occurred in the ZEO Client Storage.""" """An error occurred in the ZEO Client Storage.
"""
class UnrecognizedResult(ClientStorageError): class UnrecognizedResult(ClientStorageError):
"""A server call returned an unrecognized result.""" """A server call returned an unrecognized result.
"""
class ClientDisconnected(ClientStorageError): class ClientDisconnected(ClientStorageError,
"""The database storage is disconnected from the storage.""" transaction.interfaces.TransientError):
"""The database storage is disconnected from the storage.
"""
class AuthError(StorageError): class AuthError(StorageError):
"""The client provided invalid authentication credentials.""" """The client provided invalid authentication credentials.
"""
class ProtocolError(ClientStorageError): class ProtocolError(ClientStorageError):
"""A client contacted a server with an incomparible protocol """A client contacted a server with an incomparible protocol
......
...@@ -1411,6 +1411,14 @@ call to the server. we'd get some sort of error here. ...@@ -1411,6 +1411,14 @@ call to the server. we'd get some sort of error here.
"""
def ClientDisconnected_errors_are_TransientErrors():
"""
>>> from ZEO.Exceptions import ClientDisconnected
>>> from transaction.interfaces import TransientError
>>> issubclass(ClientDisconnected, TransientError)
True
""" """
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
......
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