Skip to content

Fix dict hanlding in pool and metrics #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2025
Merged

Fix dict hanlding in pool and metrics #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cassandra/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ def __init__(self, cluster_proxy):
scales.Stat('known_hosts',
lambda: len(cluster_proxy.metadata.all_hosts())),
scales.Stat('connected_to',
lambda: len(set(chain.from_iterable(s._pools.keys() for s in cluster_proxy.sessions)))),
lambda: len(set(chain.from_iterable(list(s._pools.keys()) for s in cluster_proxy.sessions)))),
scales.Stat('open_connections',
lambda: sum(sum(p.open_count for p in s._pools.values()) for s in cluster_proxy.sessions)))
lambda: sum(sum(p.open_count for p in list(s._pools.values())) for s in cluster_proxy.sessions)))

# TODO, to be removed in 4.0
# /cassandra contains the metrics of the first cluster registered
Expand Down
14 changes: 7 additions & 7 deletions cassandra/pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ def _get_connection_for_routing_key(self, routing_key=None, keyspace=None, table
"Connection to shard_id=%i reached orphaned stream limit, replacing on host %s (%s/%i)",
shard_id,
self.host,
len(self._connections.keys()),
len(self._connections),
self.host.sharding_info.shards_count
)
elif shard_id not in self._connecting:
Expand All @@ -503,7 +503,7 @@ def _get_connection_for_routing_key(self, routing_key=None, keyspace=None, table
"Trying to connect to missing shard_id=%i on host %s (%s/%i)",
shard_id,
self.host,
len(self._connections.keys()),
len(self._connections),
self.host.sharding_info.shards_count
)

Expand Down Expand Up @@ -607,7 +607,7 @@ def _replace(self, connection):

log.debug("Replacing connection (%s) to %s", id(connection), self.host)
try:
if connection.features.shard_id in self._connections.keys():
if connection.features.shard_id in self._connections:
del self._connections[connection.features.shard_id]
if self.host.sharding_info and not self._session.cluster.shard_aware_options.disable:
self._connecting.add(connection.features.shard_id)
Expand Down Expand Up @@ -759,7 +759,7 @@ def _open_connection_to_missing_shard(self, shard_id):
with self._lock:
is_shutdown = self.is_shutdown
if not is_shutdown:
if conn.features.shard_id in self._connections.keys():
if conn.features.shard_id in self._connections:
# Move the current connection to the trash and use the new one from now on
old_conn = self._connections[conn.features.shard_id]
log.debug(
Expand Down Expand Up @@ -804,7 +804,7 @@ def _open_connection_to_missing_shard(self, shard_id):
num_missing_or_needing_replacement = self.num_missing_or_needing_replacement
log.debug(
"Connected to %s/%i shards on host %s (%i missing or needs replacement)",
len(self._connections.keys()),
len(self._connections),
self.host.sharding_info.shards_count,
self.host,
num_missing_or_needing_replacement
Expand All @@ -816,7 +816,7 @@ def _open_connection_to_missing_shard(self, shard_id):
len(self._excess_connections)
)
self._close_excess_connections()
elif self.host.sharding_info.shards_count == len(self._connections.keys()) and self.num_missing_or_needing_replacement == 0:
elif self.host.sharding_info.shards_count == len(self._connections) and self.num_missing_or_needing_replacement == 0:
log.debug(
"All shards are already covered, closing newly opened excess connection %s for host %s",
id(self),
Expand Down Expand Up @@ -917,7 +917,7 @@ def get_state(self):
@property
def num_missing_or_needing_replacement(self):
return self.host.sharding_info.shards_count \
- sum(1 for c in self._connections.values() if not c.orphaned_threshold_reached)
- sum(1 for c in list(self._connections.values()) if not c.orphaned_threshold_reached)

@property
def open_count(self):
Expand Down
Loading