trending/OpenShell
1
0
Fork 0
mirror of https://github.com/NVIDIA/OpenShell.git synced 2026-10-30 07:33:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(python): close client when Sandbox entry fails (#4367)

Browse Source 
* fix(python): close client when Sandbox entry fails

Signed-off-by: Eric Curtin <eric.curtin@docker.com>

* test(python): share client patch helper

Signed-off-by: Eric Curtin <eric.curtin@docker.com>

---------

Signed-off-by: Eric Curtin <eric.curtin@docker.com>
This commit is contained in:
Eric Curtin
2026-10-12 19:06:21 +00:00
committed by GitHub
parent 66696eb1c8
commit e326c10dde
2 changed files with 105 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/openshell/sandbox.py
+18 -7
View File
@@ -1643,7 +1643,7 @@ class Sandbox:
"name, labels, and workload_template cannot be set when attaching to an existing sandbox"
)
client = SandboxClient.from_active_cluster(
self._client = SandboxClient.from_active_cluster(
cluster=self._cluster,
timeout=self._timeout,
auto_refresh=self._auto_refresh,
@@ -1651,8 +1651,17 @@ class Sandbox:
insecure=self._insecure,
client_credentials=self._client_credentials,
)
self._client = client
try:
self._open_session(self._client)
except BaseException:
# Python skips __exit__ when __enter__ raises, so release here
# and keep the original error even if the close fails.
with contextlib.suppress(Exception):
self._release()
raise
return self
def _open_session(self, client: SandboxClient) -> None:
if self._sandbox_input is None and self._workload_template is not None:
self._session = client.create_session_from_template(
workspace=self._workspace,
@@ -1684,7 +1693,12 @@ class Sandbox:
)
self._session = SandboxSession(client, ready)
return self
def _release(self) -> None:
client = self._client
self._session = None
self._client = None
if client is not None:
client.close()
def __exit__(self, *args: object) -> None:
try:
@@ -1708,10 +1722,7 @@ class Sandbox:
f"unsupported deletion outcome: {result.outcome}"
)
finally:
if self._client is not None:
self._client.close()
self._session = None
self._client = None
self._release()
def exec(
self,