From d4d29cc523ab715d92f8cadff28f60996af39ffa Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Thu, 14 Apr 2016 16:27:39 -0500 Subject: [PATCH] pool.Host.release_version PYTHON-301 --- cassandra/cluster.py | 5 +++-- cassandra/pool.py | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cassandra/cluster.py b/cassandra/cluster.py index a9dacff4..a067cff6 100644 --- a/cassandra/cluster.py +++ b/cassandra/cluster.py @@ -2068,11 +2068,10 @@ class ControlConnection(object): """ _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_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_LOCAL = "SELECT schema_version FROM system.local WHERE key='local'" @@ -2351,6 +2350,7 @@ class ControlConnection(object): self._update_location_info(host, datacenter, rack) host.listen_address = local_row.get("listen_address") host.broadcast_address = local_row.get("broadcast_address") + host.release_version = local_row.get("release_version") partitioner = local_row.get("partitioner") tokens = local_row.get("tokens") @@ -2385,6 +2385,7 @@ class ControlConnection(object): should_rebuild_token_map |= self._update_location_info(host, datacenter, rack) host.broadcast_address = row.get("peer") + host.release_version = row.get("release_version") if partitioner and tokens: token_map[host] = tokens diff --git a/cassandra/pool.py b/cassandra/pool.py index 3cb14e91..25e6b820 100644 --- a/cassandra/pool.py +++ b/cassandra/pool.py @@ -78,6 +78,11 @@ class Host(object): up or down. """ + release_version = None + """ + release_version as queried from the control connection system tables + """ + _datacenter = None _rack = None _reconnection_handler = None