Skip to content

Commit bb6e597

Browse files
committed
cluster: default metadata_request_timeout to control_connection_timeout
metadata_request_timeout and control_connection_timeout are going hand by hand, control_connection_timeout is client side timeout, while metadata_request_timeout is server side. In general case they always have to be eual.
1 parent f048a8e commit bb6e597

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cassandra/cluster.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,10 +1083,11 @@ def default_retry_policy(self, policy):
10831083
used for columns in this cluster.
10841084
"""
10851085

1086-
metadata_request_timeout = datetime.timedelta(seconds=2)
1086+
metadata_request_timeout = None
10871087
"""
10881088
Timeout for all queries used by driver it self.
10891089
Supported only by Scylla clusters.
1090+
Defaults to control_connection_timeout.
10901091
"""
10911092

10921093
@property
@@ -1303,8 +1304,7 @@ def __init__(self,
13031304
self.no_compact = no_compact
13041305

13051306
self.auth_provider = auth_provider
1306-
if metadata_request_timeout is not None:
1307-
self.metadata_request_timeout = metadata_request_timeout
1307+
self.metadata_request_timeout = self.control_connection_timeout if metadata_request_timeout is None else metadata_request_timeout
13081308

13091309
if load_balancing_policy is not None:
13101310
if isinstance(load_balancing_policy, type):

0 commit comments

Comments
 (0)