aws-parallelcluster-node 3.13.2__tar.gz → 3.14.0__tar.gz

{aws_parallelcluster_node-3.13.2/src/aws_parallelcluster_node.egg-info → aws_parallelcluster_node-3.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-parallelcluster-node
-Version: 3.13.2
+Version: 3.14.0
 Summary: aws-parallelcluster-node provides the scripts for an AWS ParallelCluster node.
 Home-page: https://github.com/aws/aws-parallelcluster-node
 Author: Amazon Web Services

{aws_parallelcluster_node-3.13.2 → aws_parallelcluster_node-3.14.0}/setup.py

@@ -32,7 +32,7 @@ console_scripts = [
     "clustermgtd = slurm_plugin.clustermgtd:main",
     "computemgtd = slurm_plugin.computemgtd:main",
 ]
-version = "3.13.2"
+version = "3.14.0"
 requires = ["boto3>=1.7.55", "retrying>=1.3.3"]
 
 setup(

{aws_parallelcluster_node-3.13.2 → aws_parallelcluster_node-3.14.0/src/aws_parallelcluster_node.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-parallelcluster-node
-Version: 3.13.2
+Version: 3.14.0
 Summary: aws-parallelcluster-node provides the scripts for an AWS ParallelCluster node.
 Home-page: https://github.com/aws/aws-parallelcluster-node
 Author: Amazon Web Services

{aws_parallelcluster_node-3.13.2 → aws_parallelcluster_node-3.14.0}/src/slurm_plugin/fleet_manager.py

@@ -296,11 +296,18 @@ class Ec2CreateFleetManager(FleetManager):
             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["Networking"]["SubnetIds"]
+            subnet_ids = self._compute_resource_config.get("Networking", {}).get("SubnetIds", [])
             for subnet_id in subnet_ids:
-                overrides.update({"InstanceType": instance_type["InstanceType"], "SubnetId": subnet_id})
+                if self._uses_subnet_prioritization():
+                    overrides.update(
+                        {"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 @@ class Ec2CreateFleetManager(FleetManager):
         subnet_ids = self._compute_resource_config.get("Networking", {}).get("SubnetIds", [])
         return len(subnet_ids) == 1
 
+    def _uses_subnet_prioritization(self):
+        return (
+            self._compute_resource_config.get("AllocationStrategy") == "prioritized"
+            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:

{aws_parallelcluster_node-3.13.2 → aws_parallelcluster_node-3.14.0}/src/slurm_plugin/slurm_resources.py

@@ -223,6 +223,8 @@ class SlurmNode(metaclass=ABCMeta):
         "MaxSpotInstanceCountExceeded",
         "Unsupported",
         "SpotMaxPriceTooLow",
+        "UnfulfillableCapacity",
+        "InsufficientCapacity",
     }
 
     def __init__(