Merge branch 'release-3.7' into wip/scaleAll370

aws · Aug 22, 2023 · 2f01639 · 2f01639
2 parents 3f883c4 + 3f729d1
commit 2f01639
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@ def read(fname):
     "clustermgtd = slurm_plugin.clustermgtd:main",
     "computemgtd = slurm_plugin.computemgtd:main",
 ]
-version = "3.7.0b1"
+version = "3.7.0"
 requires = ["boto3>=1.7.55", "retrying>=1.3.3"]
 
 setup(

diff --git a/src/slurm_plugin/cluster_event_publisher.py b/src/slurm_plugin/cluster_event_publisher.py
@@ -36,10 +36,14 @@
 }
 
 
-NODE_LAUNCH_FAILURE_COUNT = {
+STATIC_NODE_LAUNCH_FAILURE_COUNT = {
     "message": "Number of static nodes that failed to launch a backing instance after node maintenance",
     "event_type": "node-launch-failure-count",
 }
+DYNAMIC_NODE_LAUNCH_FAILURE_COUNT = {
+    "message": "Number of dynamic nodes that failed to launch a backing instance",
+    "event_type": "node-launch-failure-count",
+}
 NODE_LAUNCH_FAILURE = {
     "message": "After node maintenance, node failed to launch a backing instance",
     "event_type": "node-launch-failure",
@@ -192,7 +196,7 @@ def publish_unhealthy_static_node_events(
         for count, error_detail in self._generate_launch_failure_details(failed_nodes):
             self.publish_event(
                 logging.WARNING if count else logging.DEBUG,
-                **NODE_LAUNCH_FAILURE_COUNT,
+                **STATIC_NODE_LAUNCH_FAILURE_COUNT,
                 timestamp=timestamp,
                 detail=error_detail,
             )
@@ -497,7 +501,7 @@ def publish_node_launch_events(self, failed_nodes: Dict[str, List[str]]):
         for count, error_detail in self._generate_launch_failure_details(failed_nodes):
             self.publish_event(
                 logging.WARNING if count else logging.DEBUG,
-                **NODE_LAUNCH_FAILURE_COUNT,
+                **DYNAMIC_NODE_LAUNCH_FAILURE_COUNT,
                 timestamp=timestamp,
                 detail=error_detail,
             )