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

Correctly handle ignored hosts everywhere

Browse Source 
Session.add_or_renew_pool returns None instead of a future
when a host is ignored.
This commit is contained in:
Tyler Hobbs
2013-11-21 17:48:26 -06:00
parent 7f02b24899
commit 4d666384bb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cassandra/cluster.py
View File

@@ -552,8 +552,9 @@ class Cluster(object):
callback = partial(self._on_up_future_completed, host, futures, futures_results, futures_lock)
for session in self.sessions:
future = session.add_or_renew_pool(host, is_host_addition=False)
future.add_done_callback(callback)
futures.add(future)
if future is not None:
future.add_done_callback(callback)
futures.add(future)
except Exception:
# this shouldn't happen, but just in case, reset the condition
for future in futures:
@@ -654,8 +655,9 @@ class Cluster(object):
for session in self.sessions:
future = session.add_or_renew_pool(host, is_host_addition=True)
futures.add(future)
future.add_done_callback(future_completed)
if future is not None:
futures.add(future)
future.add_done_callback(future_completed)
if not futures:
self._finalize_add(host)
@@ -847,7 +849,7 @@ class Session(object):
# create connection pools in parallel
futures = []
for host in hosts:
future = self.add_or_renew_pool(host, is_host_addition=False);
future = self.add_or_renew_pool(host, is_host_addition=False)
if future is not None:
futures.append(future)