Skip to content

Remove unnecessary nested if in is_backing_instance_valid() #616

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

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Remove unnecessary nested if in is_backing_instance_valid() #616

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
46 changes: 21 additions & 25 deletions src/slurm_plugin/slurm_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,34 +436,30 @@ def is_backing_instance_valid(
return self.ec2_backing_instance_valid
# Set ec2_backing_instance_valid to True since it will be the result most often
self.ec2_backing_instance_valid = True
if self.is_nodeaddr_set():
if not self.instance:
if self.is_nodeaddr_set() and not self.instance:
if log_warn_if_unhealthy:
logger.warning(
"Node state check: no corresponding instance in EC2 for node %s, node state: %s",
self,
self.state_string,
)
# Allow a few iterations for the eventual consistency of EC2 data
logger.debug(f"Map of slurm nodes without backing instances {nodes_without_backing_instance_count_map}")
missing_instance_loop_count = nodes_without_backing_instance_count_map.get(self.name, 0)
# If the loop count has been reached, the instance is unhealthy and will be terminated
if missing_instance_loop_count >= ec2_instance_missing_max_count:
if log_warn_if_unhealthy:
logger.warning(f"EC2 instance availability for node {self.name} has timed out.")
# Remove the slurm node from the map since a new instance will be launched
nodes_without_backing_instance_count_map.pop(self.name, None)
self.ec2_backing_instance_valid = False
else:
nodes_without_backing_instance_count_map[self.name] = missing_instance_loop_count + 1
if log_warn_if_unhealthy:
logger.warning(
"Node state check: no corresponding instance in EC2 for node %s, node state: %s",
self,
self.state_string,
f"Incrementing missing EC2 instance count for node {self.name} to "
f"{nodes_without_backing_instance_count_map[self.name]}."
)
# Allow a few iterations for the eventual consistency of EC2 data
logger.debug(f"Map of slurm nodes without backing instances {nodes_without_backing_instance_count_map}")
missing_instance_loop_count = nodes_without_backing_instance_count_map.get(self.name, 0)
# If the loop count has been reached, the instance is unhealthy and will be terminated
if missing_instance_loop_count >= ec2_instance_missing_max_count:
if log_warn_if_unhealthy:
logger.warning(f"EC2 instance availability for node {self.name} has timed out.")
# Remove the slurm node from the map since a new instance will be launched
nodes_without_backing_instance_count_map.pop(self.name, None)
self.ec2_backing_instance_valid = False
else:
nodes_without_backing_instance_count_map[self.name] = missing_instance_loop_count + 1
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]}."
)
else:
# Remove the slurm node from the map since the instance is healthy
nodes_without_backing_instance_count_map.pop(self.name, None)
else:
# Remove the slurm node from the map since the instance is healthy
nodes_without_backing_instance_count_map.pop(self.name, None)
Expand Down