Skip to content

Commit 083b388

Browse files
author
Andrey Cheptsov
committed
Drop get_create_instance_offers wrapper
1 parent 7e68452 commit 083b388

File tree

2 files changed

+4
-38
lines changed

2 files changed

+4
-38
lines changed

src/dstack/_internal/server/background/pipeline_tasks/instances/cloud_provisioning.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
)
3737
from dstack._internal.server.db import get_session_ctx
3838
from dstack._internal.server.models import FleetModel, InstanceModel, PlacementGroupModel
39-
from dstack._internal.server.services.fleets import get_create_instance_offers, is_cloud_cluster
39+
from dstack._internal.server.services.fleets import get_fleet_offers, is_cloud_cluster
4040
from dstack._internal.server.services.instances import (
4141
get_instance_configuration,
4242
get_instance_profile,
@@ -101,7 +101,7 @@ async def create_cloud_instance(instance_model: InstanceModel) -> ProcessResult:
101101
)
102102
master_job_provisioning_data = cluster_context.master_job_provisioning_data
103103

104-
offers = await get_create_instance_offers(
104+
offers = await get_fleet_offers(
105105
project=instance_model.project,
106106
profile=profile,
107107
requirements=requirements,
@@ -111,6 +111,7 @@ async def create_cloud_instance(instance_model: InstanceModel) -> ProcessResult:
111111
exclude_not_available=True,
112112
master_job_provisioning_data=master_job_provisioning_data,
113113
infer_master_job_provisioning_data_from_fleet_instances=False,
114+
include_only_create_instance_supported_backends=True,
114115
)
115116

116117
# Limit number of offers tried to prevent long-running processing in case all offers fail.
@@ -120,7 +121,7 @@ async def create_cloud_instance(instance_model: InstanceModel) -> ProcessResult:
120121
compute = backend.compute()
121122
assert isinstance(compute, ComputeWithCreateInstanceSupport)
122123
if master_job_provisioning_data is not None:
123-
# `get_create_instance_offers()` already restricts backend and region from the master.
124+
# `get_fleet_offers()` already restricts backend and region from the master.
124125
# Availability zone still has to be narrowed per offer.
125126
instance_offer = get_instance_offer_with_restricted_az(
126127
instance_offer=instance_offer,

src/dstack/_internal/server/services/fleets.py

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -476,41 +476,6 @@ async def get_plan(
476476
return plan
477477

478478

479-
async def get_create_instance_offers(
480-
project: ProjectModel,
481-
profile: Profile,
482-
requirements: Requirements,
483-
placement_group: Optional[PlacementGroup] = None,
484-
fleet_spec: Optional[FleetSpec] = None,
485-
fleet_model: Optional[FleetModel] = None,
486-
blocks: Union[int, Literal["auto"]] = 1,
487-
exclude_not_available: bool = False,
488-
master_job_provisioning_data: Optional[JobProvisioningData] = None,
489-
infer_master_job_provisioning_data_from_fleet_instances: bool = True,
490-
) -> List[Tuple[Backend, InstanceOfferWithAvailability]]:
491-
"""
492-
Return fleet offers restricted to backends that support `create_instance`.
493-
494-
This method is for create-instance provisioning semantics
495-
(typically VM-based backends, not container-only backends).
496-
"""
497-
return await get_fleet_offers(
498-
project=project,
499-
profile=profile,
500-
requirements=requirements,
501-
placement_group=placement_group,
502-
fleet_spec=fleet_spec,
503-
fleet_model=fleet_model,
504-
blocks=blocks,
505-
exclude_not_available=exclude_not_available,
506-
master_job_provisioning_data=master_job_provisioning_data,
507-
infer_master_job_provisioning_data_from_fleet_instances=(
508-
infer_master_job_provisioning_data_from_fleet_instances
509-
),
510-
include_only_create_instance_supported_backends=True,
511-
)
512-
513-
514479
async def get_fleet_offers(
515480
project: ProjectModel,
516481
profile: Profile,

0 commit comments

Comments
 (0)