Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from dstack._internal.server.services import backends as backends_services
from dstack._internal.server.services.instances import get_instance_provisioning_data
from dstack._internal.server.services.runner.pool import (
InstanceConnectionKey,
instance_connection_pool,
)
from dstack._internal.utils.common import get_current_datetime, run_async
Expand Down Expand Up @@ -82,7 +81,7 @@ async def terminate_instance(instance_model: InstanceModel) -> ProcessResult:
)

if job_provisioning_data is not None:
instance_connection_pool.drop(InstanceConnectionKey.from_jpd(job_provisioning_data))
instance_connection_pool.drop_by_jpd(job_provisioning_data)

result.instance_update_map["deleted"] = True
result.instance_update_map["deleted_at"] = NOW_PLACEHOLDER
Expand Down
6 changes: 6 additions & 0 deletions src/dstack/_internal/server/services/runner/pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ def drop(self, key: InstanceConnectionKey) -> None:
except Exception:
logger.exception("Failed to close instance connection %s", key)

def drop_by_jpd(self, jpd: JobProvisioningData, jrd: Optional[JobRuntimeData] = None):
if jpd.hostname is None or jpd.ssh_port is None:
return
key = InstanceConnectionKey.from_jpd(jpd, jrd)
self.drop(key)

def startup_cleanup(self) -> None:
"""
Removes connection dirs left by a previous server process (e.g. after SIGKILL).
Expand Down
Loading