-
Notifications
You must be signed in to change notification settings - Fork 222
Show offers in dstack apply for elastic container fleets #3754
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
peterschmidt85
wants to merge
1
commit into
master
Choose a base branch
from
fix/fleet-elastic-container-offers
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -442,13 +442,25 @@ async def get_plan( | |
|
|
||
| offers = [] | ||
| if effective_spec.configuration.ssh_config is None: | ||
| offers_with_backends = await get_create_instance_offers( | ||
| project=project, | ||
| profile=effective_spec.merged_profile, | ||
| requirements=get_fleet_requirements(effective_spec), | ||
| fleet_spec=effective_spec, | ||
| blocks=effective_spec.configuration.blocks, | ||
| ) | ||
| requirements = get_fleet_requirements(effective_spec) | ||
| if _is_elastic_cloud_fleet_spec(effective_spec): | ||
| offers_with_backends = await offers_services.get_offers_by_requirements( | ||
| project=project, | ||
| profile=effective_spec.merged_profile, | ||
| requirements=requirements, | ||
| multinode=( | ||
| effective_spec.configuration.placement == InstanceGroupPlacement.CLUSTER | ||
| ), | ||
| blocks=effective_spec.configuration.blocks, | ||
| ) | ||
| else: | ||
| offers_with_backends = await get_create_instance_offers( | ||
| project=project, | ||
| profile=effective_spec.merged_profile, | ||
| requirements=requirements, | ||
| fleet_spec=effective_spec, | ||
| blocks=effective_spec.configuration.blocks, | ||
| ) | ||
| offers = [offer for _, offer in offers_with_backends] | ||
|
|
||
| _remove_fleet_spec_sensitive_info(effective_spec) | ||
|
|
@@ -468,6 +480,16 @@ async def get_plan( | |
| return plan | ||
|
|
||
|
|
||
| def _is_elastic_cloud_fleet_spec(fleet_spec: FleetSpec) -> bool: | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This function name is a misnomer since it does not really check that the fleet is elastic (nodes is a range) but that nodes.target == 0. And since target cannot be less than min, that's all we need to check for. |
||
| nodes = fleet_spec.configuration.nodes | ||
| return ( | ||
| fleet_spec.configuration.ssh_config is None | ||
| and nodes is not None | ||
| and nodes.min == 0 | ||
| and nodes.target == 0 | ||
| ) | ||
|
|
||
|
|
||
| async def get_create_instance_offers( | ||
| project: ProjectModel, | ||
| profile: Profile, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Having two branches with get_offers_by_requirements and get_create_instance_offers seems too verbose here. I think it can be replaced with a get_create_instance_offers param that would enable/disable BACKENDS_WITH_CREATE_INSTANCE_SUPPORT filtering.