[Subnet Prioritization] Support capacity-optimized-prioritized and prioritized Allocation Strategy #671
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
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 |
|---|---|---|
|
|
@@ -296,11 +296,18 @@ def _evaluate_template_overrides(self) -> list: | |
| if self._compute_resource_config.get("MaxPrice"): | ||
| overrides.update({"MaxPrice": str(self._compute_resource_config["MaxPrice"])}) | ||
|
|
||
| priority = 0.0 | ||
| for instance_type in self._compute_resource_config["Instances"]: | ||
| subnet_ids = self._compute_resource_config.get("Networking", {}).get("SubnetIds", []) | ||
| for subnet_id in subnet_ids: | ||
| if self._uses_subnet_prioritization(): | ||
| overrides.update( | ||
|
There was a problem hiding this comment. [CodeStyle] We could reduce code duplication by defining the common part of the dictionary just once, then add the priority to it if subnet prioritization is enabled. |
||
| {"InstanceType": instance_type["InstanceType"], "SubnetId": subnet_id, "Priority": priority} | ||
| ) | ||
| else: | ||
| overrides.update({"InstanceType": instance_type["InstanceType"], "SubnetId": subnet_id}) | ||
| template_overrides.append(copy.deepcopy(overrides)) | ||
| priority += 1.0 | ||
| return template_overrides | ||
|
|
||
| def _uses_single_instance_type(self): | ||
|
|
@@ -312,6 +319,15 @@ def _uses_single_az(self): | |
| subnet_ids = self._compute_resource_config.get("Networking", {}).get("SubnetIds", []) | ||
| return len(subnet_ids) == 1 | ||
|
|
||
| def _uses_subnet_prioritization(self): | ||
|
There was a problem hiding this comment. [Tests] We are introducing a new function. We are testing it as part of the unit tests for the upper level function |
||
| return ( | ||
| self._compute_resource_config.get("AllocationStrategy") == "prioritized" | ||
Allenz5 marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. [CodeStyle] "prioritized", "on-demand", "spot", "capacity-optimized-prioritized" should be defined as constants in an Enum within a common script (see how we did it in cli package: https://github.com/aws/aws-parallelcluster/blob/develop/cli/src/pcluster/config/common.py#L31-L36). This is a good way to use the code as a way to document supported values, prevent constants to be redefined and potential errors caused by typos. |
||
| and self._compute_resource_config["CapacityType"] == "on-demand" | ||
| ) or ( | ||
| self._compute_resource_config.get("AllocationStrategy") == "capacity-optimized-prioritized" | ||
| and self._compute_resource_config["CapacityType"] == "spot" | ||
| ) | ||
|
|
||
| def _evaluate_launch_params(self, count): | ||
| """Evaluate parameters to be passed to create_fleet call.""" | ||
| try: | ||
|
|
||
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
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
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 |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| { | ||
| "LaunchTemplateConfigs": [ | ||
| { | ||
| "LaunchTemplateSpecification": { | ||
| "LaunchTemplateName": "hit-queue-capacity-optimized-prioritized-fleet1", | ||
| "Version": "$Latest" | ||
| }, | ||
| "Overrides": [ | ||
| { | ||
| "InstanceType": "t2.medium", | ||
| "SubnetId": "1234567", | ||
| "Priority": 0.0 | ||
| }, | ||
| { | ||
| "InstanceType": "t2.medium", | ||
| "SubnetId": "7654321", | ||
| "Priority": 1.0 | ||
| }, | ||
| { | ||
| "InstanceType": "t2.large", | ||
| "SubnetId": "1234567", | ||
| "Priority": 2.0 | ||
| }, | ||
| { | ||
| "InstanceType": "t2.large", | ||
| "SubnetId": "7654321", | ||
| "Priority": 3.0 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "SpotOptions": { | ||
| "SingleInstanceType": false, | ||
| "SingleAvailabilityZone": false, | ||
| "AllocationStrategy": "capacity-optimized-prioritized" | ||
| }, | ||
| "TargetCapacitySpecification": { | ||
| "TotalTargetCapacity": 5, | ||
| "DefaultTargetCapacityType": "spot" | ||
| }, | ||
| "Type": "instant" | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| { | ||
| "LaunchTemplateConfigs": [ | ||
| { | ||
| "LaunchTemplateSpecification": { | ||
| "LaunchTemplateName": "hit-queue-capacity-optimized-prioritized-all-or-nothing-fleet1", | ||
| "Version": "$Latest" | ||
| }, | ||
| "Overrides": [ | ||
| { | ||
| "InstanceType": "t2.medium", | ||
| "SubnetId": "1234567", | ||
| "Priority": 0.0 | ||
| }, | ||
| { | ||
| "InstanceType": "t2.medium", | ||
| "SubnetId": "7654321", | ||
| "Priority": 1.0 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "SpotOptions": { | ||
| "SingleInstanceType": true, | ||
| "SingleAvailabilityZone": false, | ||
| "AllocationStrategy": "capacity-optimized-prioritized", | ||
| "MinTargetCapacity": 5 | ||
| }, | ||
| "TargetCapacitySpecification": { | ||
| "TotalTargetCapacity": 5, | ||
| "DefaultTargetCapacityType": "spot" | ||
| }, | ||
| "Type": "instant" | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| { | ||
| "LaunchTemplateConfigs": [ | ||
| { | ||
| "LaunchTemplateSpecification": { | ||
| "LaunchTemplateName": "hit-queue-prioritized-fleet1", | ||
| "Version": "$Latest" | ||
| }, | ||
| "Overrides": [ | ||
| { | ||
| "InstanceType": "t2.medium", | ||
| "SubnetId": "1234567", | ||
| "Priority": 0.0 | ||
| }, | ||
| { | ||
| "InstanceType": "t2.medium", | ||
| "SubnetId": "7654321", | ||
| "Priority": 1.0 | ||
| }, | ||
| { | ||
| "InstanceType": "t2.large", | ||
| "SubnetId": "1234567", | ||
| "Priority": 2.0 | ||
| }, | ||
| { | ||
| "InstanceType": "t2.large", | ||
| "SubnetId": "7654321", | ||
| "Priority": 3.0 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "OnDemandOptions": { | ||
| "AllocationStrategy": "prioritized", | ||
| "SingleInstanceType": false, | ||
| "SingleAvailabilityZone": false, | ||
Allenz5 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "CapacityReservationOptions": { | ||
| "UsageStrategy": "use-capacity-reservations-first" | ||
| } | ||
| }, | ||
| "TargetCapacitySpecification": { | ||
| "TotalTargetCapacity": 5, | ||
| "DefaultTargetCapacityType": "on-demand" | ||
| }, | ||
| "Type": "instant" | ||
| } | ||
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 |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "LaunchTemplateConfigs": [ | ||
| { | ||
| "LaunchTemplateSpecification": { | ||
| "LaunchTemplateName": "hit-queue-prioritized-all-or-nothing-fleet1", | ||
| "Version": "$Latest" | ||
| }, | ||
| "Overrides": [ | ||
| { | ||
| "InstanceType": "t2.medium", | ||
| "SubnetId": "1234567", | ||
| "Priority": 0.0 | ||
| }, | ||
| { | ||
| "InstanceType": "t2.medium", | ||
| "SubnetId": "7654321", | ||
| "Priority": 1.0 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "OnDemandOptions": { | ||
| "AllocationStrategy": "prioritized", | ||
| "SingleInstanceType": true, | ||
| "SingleAvailabilityZone": false, | ||
| "CapacityReservationOptions": { | ||
| "UsageStrategy": "use-capacity-reservations-first" | ||
| }, | ||
| "MinTargetCapacity": 5 | ||
| }, | ||
| "TargetCapacitySpecification": { | ||
| "TotalTargetCapacity": 5, | ||
| "DefaultTargetCapacityType": "on-demand" | ||
| }, | ||
| "Type": "instant" | ||
| } |
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.
The change log entry should be more focus on the user experience. Could even simply be "Support new allocation strategies
prioritizedandcapacity-optimized-prioritizedto take into account the subnet prioritization on scale out."