aws-parallelcluster-node 3.5.1__tar.gz → 3.6.0__tar.gz

{aws-parallelcluster-node-3.5.1/src/aws_parallelcluster_node.egg-info → aws-parallelcluster-node-3.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws-parallelcluster-node
-Version: 3.5.1
+Version: 3.6.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.5.1 → aws-parallelcluster-node-3.6.0}/setup.py

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

{aws-parallelcluster-node-3.5.1 → aws-parallelcluster-node-3.6.0/src/aws_parallelcluster_node.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aws-parallelcluster-node
-Version: 3.5.1
+Version: 3.6.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.5.1 → aws-parallelcluster-node-3.6.0}/src/aws_parallelcluster_node.egg-info/SOURCES.txt

@@ -10,11 +10,13 @@ src/aws_parallelcluster_node.egg-info/not-zip-safe
 src/aws_parallelcluster_node.egg-info/requires.txt
 src/aws_parallelcluster_node.egg-info/top_level.txt
 src/common/__init__.py
+src/common/ec2_utils.py
 src/common/time_utils.py
 src/common/utils.py
 src/common/schedulers/__init__.py
 src/common/schedulers/slurm_commands.py
 src/slurm_plugin/__init__.py
+src/slurm_plugin/cluster_event_publisher.py
 src/slurm_plugin/clustermgtd.py
 src/slurm_plugin/common.py
 src/slurm_plugin/computemgtd.py

aws-parallelcluster-node-3.6.0/src/common/ec2_utils.py

@@ -0,0 +1,29 @@
+# Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "LICENSE.txt" file accompanying this file.
+# This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
+
+
+def get_private_ip_address(instance_info):
+    """
+    Return the PrivateIpAddress of the EC2 instance.
+
+    The PrivateIpAddress is considered to be the one for the
+    network interface with DeviceIndex = NetworkCardIndex = 0.
+    :param instance_info: the dictionary returned by a EC2:DescribeInstances call.
+    :return: the PrivateIpAddress of the instance.
+    """
+    private_ip = instance_info["PrivateIpAddress"]
+    for network_interface in instance_info["NetworkInterfaces"]:
+        attachment = network_interface["Attachment"]
+        if attachment["DeviceIndex"] == 0 and attachment["NetworkCardIndex"] == 0:
+            private_ip = network_interface["PrivateIpAddress"]
+            break
+    return private_ip

{aws-parallelcluster-node-3.5.1 → aws-parallelcluster-node-3.6.0}/src/common/schedulers/slurm_commands.py

@@ -61,7 +61,7 @@ SINFO = f"{SLURM_BINARIES_DIR}/sinfo"
 SCONTROL_OUTPUT_AWK_PARSER = (
     'awk \'BEGIN{{RS="\\n\\n" ; ORS="######\\n";}} {{print}}\' | '
     + "grep -oP '^(NodeName=\\S+)|(NodeAddr=\\S+)|(NodeHostName=\\S+)|(?<!Next)(State=\\S+)|"
-    + "(Partitions=\\S+)|(SlurmdStartTime=\\S+)|(Reason=.*)|(######)'"
+    + "(Partitions=\\S+)|(SlurmdStartTime=\\S+)|(LastBusyTime=\\S+)|(Reason=.*)|(######)'"
 )
 
 # Set default timeouts for running different slurm commands.
@@ -333,7 +333,8 @@ def _parse_nodes_info(slurm_node_info: str) -> List[SlurmNode]:
     """Parse slurm node info into SlurmNode objects."""
     # [ec2-user@ip-10-0-0-58 ~]$ /opt/slurm/bin/scontrol show nodes compute-dy-c5xlarge-[1-3],compute-dy-c5xlarge-50001\
     # | awk 'BEGIN{{RS="\n\n" ; ORS="######\n";}} {{print}}' | grep -oP "^(NodeName=\S+)|(NodeAddr=\S+)
-    # |(NodeHostName=\S+)|(?<!Next)(State=\S+)|(Partitions=\S+)|(SlurmdStartTime=\S+)|(Reason=.*)|(######)"
+    # |(NodeHostName=\S+)|(?<!Next)(State=\S+)|(Partitions=\S+)|(SlurmdStartTime=\S+)|(LastBusyTime=\\S+)|(Reason=.*)\
+    # |(######)"
     # NodeName=compute-dy-c5xlarge-1
     # NodeAddr=1.2.3.4
     # NodeHostName=compute-dy-c5xlarge-1
@@ -372,8 +373,11 @@ def _parse_nodes_info(slurm_node_info: str) -> List[SlurmNode]:
         "Partitions": "partitions",
         "Reason": "reason",
         "SlurmdStartTime": "slurmdstarttime",
+        "LastBusyTime": "lastbusytime",
     }
 
+    date_fields = ["SlurmdStartTime", "LastBusyTime"]
+
     node_info = slurm_node_info.split("######\n")
     slurm_nodes = []
     for node in node_info:
@@ -381,8 +385,8 @@ def _parse_nodes_info(slurm_node_info: str) -> List[SlurmNode]:
         kwargs = {}
         for line in lines:
             key, value = line.split("=")
-            if key == "SlurmdStartTime":
-                if value != "None":
+            if key in date_fields:
+                if value not in ["None", "Unknown"]:
                     value = datetime.strptime(value, "%Y-%m-%dT%H:%M:%S").astimezone(tz=timezone.utc)
                 else:
                     value = None