Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Refactor logic in _is_node_in_replacement_valid() to account for node.instance being None #620

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Refactor logic in _is_node_in_replacement_valid() to account for node.instance being None #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/slurm_plugin/clustermgtd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,6 +1207,7 @@ def _is_node_in_replacement_valid(self, node: SlurmNode, check_node_is_valid):
If check_node_is_valid=True, check whether a node is in replacement,
If check_node_is_valid=False, check whether a node is replacement timeout.
"""
log.debug(f"Checking if node is in replacement {node}")
if (
node.is_backing_instance_valid(
self._config.ec2_instance_missing_max_count,
Expand All @@ -1215,9 +1216,15 @@ def _is_node_in_replacement_valid(self, node: SlurmNode, check_node_is_valid):
)
and node.name in self._static_nodes_in_replacement
):
time_is_expired = time_is_up(
node.instance.launch_time, self._current_time, grace_time=self._config.node_replacement_timeout
# Set `time_is_expired` to `False` if `node.instance` is `None` since we don't have a launch time yet
time_is_expired = (
False
if not node.instance
else time_is_up(
node.instance.launch_time, self._current_time, grace_time=self._config.node_replacement_timeout
)
)
log.debug(f"Node {node} is in replacement and timer expired? {time_is_expired}, instance? {node.instance}")
return not time_is_expired if check_node_is_valid else time_is_expired
return False

Expand Down
2 changes: 1 addition & 1 deletion src/slurm_plugin/slurm_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ def is_backing_instance_valid(
if log_warn_if_unhealthy:
logger.warning(
f"Incrementing missing EC2 instance count for node {self.name} to "
f"{nodes_without_backing_instance_count_map[self.name]}."
f"{nodes_without_backing_instance_count_map[self.name].count}."
)
else:
# Remove the slurm node from the map since the instance is healthy
Expand Down
Loading