openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Make Cluster.retry_policy a non-factory

Browse Source
This commit is contained in:
Tyler Hobbs
2013-07-03 12:42:12 -05:00
parent 68ebcde3ae
commit b996decdcf
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cassandra/cluster.py
View File

@@ -107,23 +107,23 @@ class Cluster(object):
reconnection_policy = ExponentialReconnectionPolicy(1.0, 600.0)
"""
An instance of :class:`policies.ReconnectionPolicy`. Defaults to an instance
of :class:`ExponentialReconnectionPolicy` with a base delay of one second and
An instance of :class:`.policies.ReconnectionPolicy`. Defaults to an instance
of :class:`.ExponentialReconnectionPolicy` with a base delay of one second and
a max delay of ten minutes.
"""
retry_policy_factory = RetryPolicy
default_retry_policy = RetryPolicy()
"""
A factory function which creates instances of
:class:`policies.RetryPolicy`. Defaults to
:class:`policies.RetryPolicy`.
A default :class:`.policies.RetryPolicy` instance to use for all
:class:`.Query` objects which do not have a :attr:`~.Query.retry_policy`
explicitly set.
"""
conviction_policy_factory = SimpleConvictionPolicy
"""
A factory function which creates instances of
:class:`policies.ConvictionPolicy`. Defaults to
:class:`policies.SimpleConvictionPolicy`.
:class:`.policies.ConvictionPolicy`. Defaults to
:class:`.policies.SimpleConvictionPolicy`.
"""
metrics_enabled = False
@@ -177,7 +177,7 @@ class Cluster(object):
auth_provider=None,
load_balancing_policy=None,
reconnection_policy=None,
retry_policy_factory=None,
default_retry_policy=None,
conviction_policy_factory=None,
metrics_enabled=False,
connection_class=None,
@@ -204,10 +204,8 @@ class Cluster(object):
if reconnection_policy is not None:
self.reconnection_policy = reconnection_policy
if retry_policy_factory is not None:
if not callable(retry_policy_factory):
raise ValueError("retry_policy_factory must be callable")
self.retry_policy_factory = retry_policy_factory
if default_retry_policy is not None:
self.default_retry_policy = default_retry_policy
if conviction_policy_factory is not None:
if not callable(conviction_policy_factory):
@@ -1363,7 +1361,7 @@ class ResponseFuture(object):
if self.query:
retry_policy = self.query.retry_policy
if not retry_policy:
retry_policy = self.session.cluster.retry_policy_factory()
retry_policy = self.session.cluster.default_retry_policy
if isinstance(response, ReadTimeoutErrorMessage):
retry = retry_policy.on_read_timeout(

5
cassandra/policies.py
View File

@@ -459,9 +459,8 @@ class RetryPolicy(object):
and unavailable failures.
To specify a default retry policy, set the
:attr:`.Cluster.retry_policy_factory` attribute to this class,
one of its subclasses, or a function that returns instances of this
class or a subclass.
:attr:`.Cluster.default_retry_policy` attribute to an instance of this
class or one of its subclasses.
To specify a retry policy per query, set the :attr:`.Query.retry_policy`
attribute to an instance of this class or one of its subclasses.

7
tests/integration/test_cluster.py
View File

@@ -45,8 +45,7 @@ class ClusterTests(unittest.TestCase):
def foo(*args, **kwargs):
return Mock()
for kw in ('auth_provider', 'retry_policy_factory',
'conviction_policy_factory'):
for kw in ('auth_provider', 'conviction_policy_factory'):
kwargs = {kw: 123}
self.assertRaises(ValueError, Cluster, **kwargs)
@@ -55,8 +54,8 @@ class ClusterTests(unittest.TestCase):
self.assertEquals(getattr(c, kw), foo)
for kw in ('contact_points', 'port', 'compression', 'metrics_enabled',
'load_balancing_policy', 'reconnection_policy', 'sockopts',
'max_schema_agreement_wait'):
'load_balancing_policy', 'retry_policy', 'reconnection_policy',
'sockopts', 'max_schema_agreement_wait'):
kwargs = {kw: (1, 2, 3)}
c = Cluster(**kwargs)
self.assertEquals(getattr(c, kw), (1, 2, 3))