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

Fix bugs in ResourceHandle preference #117

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Fix bugs in ResourceHandle preference #117

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e835da5
Fix bug in ResourceHandle age preference
jkupferer Sep 4, 2024
c64f4ed
Fix resource handle preference logic.
jkupferer Sep 4, 2024
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
16 changes: 8 additions & 8 deletions operator/resourcehandle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,35 +36,35 @@ def __lt__(self, cmp):
'''Compare matches by preference'''
if self.resource_count_difference < cmp.resource_count_difference:
return True
elif self.resource_count_difference > cmp.resource_count_difference:
if self.resource_count_difference > cmp.resource_count_difference:
return False

if self.resource_name_difference_count < cmp.resource_name_difference_count:
return True
elif self.resource_name_difference_count > cmp.resource_name_difference_count:
if self.resource_name_difference_count > cmp.resource_name_difference_count:
return False

if self.template_difference_count < cmp.template_difference_count:
return True
elif self.template_difference_count > cmp.template_difference_count:
if self.template_difference_count > cmp.template_difference_count:
return False

# Prefer healthy resources to unknown health state
if self.resource_handle.is_healthy and not cmp.resource_handle.is_healthy == None:
if self.resource_handle.is_healthy and cmp.resource_handle.is_healthy == None:
return True
elif not self.resource_handle.is_healthy and cmp.resource_handle.is_healthy == None:
if self.resource_handle.is_healthy == None and cmp.resource_handle.is_healthy:
return False

# Prefer ready resources to unready or unknown readiness state
if self.resource_handle.is_ready and not cmp.resource_handle.is_ready:
return True
elif not self.resource_handle.is_ready and cmp.resource_handle.is_ready:
if not self.resource_handle.is_ready and cmp.resource_handle.is_ready:
return False

# Prefer unknown readiness state to known unready state
if self.resource_handle.is_ready == None and not cmp.resource_handle.is_ready == False:
if self.resource_handle.is_ready == None and cmp.resource_handle.is_ready == False:
return True
elif not self.resource_handle.is_ready == False and cmp.resource_handle.is_ready == None:
if not self.resource_handle.is_ready == False and cmp.resource_handle.is_ready == None:
return False

# Prefer older matches
Expand Down
Loading