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

pool.Host.release_version

Browse Source 
PYTHON-301
This commit is contained in:
Adam Holmberg
2016-04-14 16:27:39 -05:00
parent cd40b53d04
commit d4d29cc523
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cassandra/cluster.py
View File

@@ -2068,11 +2068,10 @@ class ControlConnection(object):
""" """
_SELECT_PEERS = "SELECT * FROM system.peers" _SELECT_PEERS = "SELECT * FROM system.peers"
_SELECT_PEERS_NO_TOKENS = "SELECT peer, data_center, rack, rpc_address, schema_version FROM system.peers" _SELECT_PEERS_NO_TOKENS = "SELECT peer, data_center, rack, rpc_address, release_version, schema_version FROM system.peers"
_SELECT_LOCAL = "SELECT * FROM system.local WHERE key='local'" _SELECT_LOCAL = "SELECT * FROM system.local WHERE key='local'"
_SELECT_LOCAL_NO_TOKENS = "SELECT cluster_name, data_center, rack, partitioner, release_version, schema_version FROM system.local WHERE key='local'" _SELECT_LOCAL_NO_TOKENS = "SELECT cluster_name, data_center, rack, partitioner, release_version, schema_version FROM system.local WHERE key='local'"
_SELECT_SCHEMA_PEERS = "SELECT peer, rpc_address, schema_version FROM system.peers" _SELECT_SCHEMA_PEERS = "SELECT peer, rpc_address, schema_version FROM system.peers"
_SELECT_SCHEMA_LOCAL = "SELECT schema_version FROM system.local WHERE key='local'" _SELECT_SCHEMA_LOCAL = "SELECT schema_version FROM system.local WHERE key='local'"
@@ -2351,6 +2350,7 @@ class ControlConnection(object):
self._update_location_info(host, datacenter, rack) self._update_location_info(host, datacenter, rack)
host.listen_address = local_row.get("listen_address") host.listen_address = local_row.get("listen_address")
host.broadcast_address = local_row.get("broadcast_address") host.broadcast_address = local_row.get("broadcast_address")
host.release_version = local_row.get("release_version")
partitioner = local_row.get("partitioner") partitioner = local_row.get("partitioner")
tokens = local_row.get("tokens") tokens = local_row.get("tokens")
@@ -2385,6 +2385,7 @@ class ControlConnection(object):
should_rebuild_token_map |= self._update_location_info(host, datacenter, rack) should_rebuild_token_map |= self._update_location_info(host, datacenter, rack)
host.broadcast_address = row.get("peer") host.broadcast_address = row.get("peer")
host.release_version = row.get("release_version")
if partitioner and tokens: if partitioner and tokens:
token_map[host] = tokens token_map[host] = tokens

5
cassandra/pool.py
View File

@@ -78,6 +78,11 @@ class Host(object):
up or down. up or down.
""" """
release_version = None
"""
release_version as queried from the control connection system tables
"""
_datacenter = None _datacenter = None
_rack = None _rack = None
_reconnection_handler = None _reconnection_handler = None