Skip to content

Commit 84ec33a

Browse files
committed
add more http_client closures
1 parent 496d7f7 commit 84ec33a

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/databricks/sql/backend/thrift_backend.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def __init__(
232232
try:
233233
self._transport.open()
234234
except:
235-
self._transport.release_connection()
235+
self._transport.close()
236236
raise
237237

238238
self._request_lock = threading.RLock()
@@ -607,7 +607,7 @@ def open_session(self, session_configuration, catalog, schema) -> SessionId:
607607
self._session_id_hex = session_id.hex_guid
608608
return session_id
609609
except:
610-
self._transport.release_connection()
610+
self._transport.close()
611611
raise
612612

613613
def close_session(self, session_id: SessionId) -> None:

src/databricks/sql/client.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ def read(self) -> Optional[OAuthToken]:
284284
if hasattr(self, "session")
285285
else None,
286286
)
287+
self.http_client.close()
287288
raise e
288289

289290
self.use_inline_params = self._set_use_inline_params_with_warning(
@@ -362,8 +363,9 @@ def __exit__(self, exc_type, exc_value, traceback):
362363
def __del__(self):
363364
if self.open:
364365
logger.debug(
365-
"Closing unclosed connection for session "
366-
"{}".format(self.get_session_id_hex())
366+
"Closing unclosed connection for session " "{}".format(
367+
self.get_session_id_hex()
368+
)
367369
)
368370
try:
369371
self._close(close_cursors=False)

src/databricks/sql/telemetry/telemetry_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ def close(self):
359359
"""Flush remaining events before closing"""
360360
logger.debug("Closing TelemetryClient for connection %s", self._session_id_hex)
361361
self._flush()
362+
self._http_client.close()
362363

363364

364365
class TelemetryClientFactory:
@@ -460,7 +461,6 @@ def initialize_telemetry_client(
460461
):
461462
"""Initialize a telemetry client for a specific connection if telemetry is enabled"""
462463
try:
463-
464464
with TelemetryClientFactory._lock:
465465
TelemetryClientFactory._initialize()
466466

0 commit comments

Comments
 (0)