Skip to content

cleanup: remove obsolete Kubernetes ValueError catch #758

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

Closed
parthnayyar07 wants to merge 1 commit into from
Closed

cleanup: remove obsolete Kubernetes ValueError catch #758

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
34 changes: 11 additions & 23 deletions reana_server/status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,18 +355,11 @@ def get_unschedulable_nodes(self):

def get_nodes_memory(self):
"""Get list of all node memory capacities."""
try:
nodes = current_k8s_corev1_api_client.list_node()
return [
kubernetes_memory_to_bytes(node.status.capacity["memory"])
for node in nodes.items
]
except ValueError as e:
# FIXME: after new Kubernetes release this should be not needed
msg = "Error while retreiving k8s list of nodes."
logging.error(msg)
logging.error(e)
return []
nodes = current_k8s_corev1_api_client.list_node()
return [
kubernetes_memory_to_bytes(node.status.capacity["memory"])
for node in nodes.items
]

def get_total_memory(self):
"""Get total memory from all nodes."""
Expand Down Expand Up @@ -402,18 +395,13 @@ def get_memory_usage(self):
)
result[node_name]["percentage"] = f"{node_usage_percentage}%"
result[node_name]["available"] = node_capacity_bytes - node_usage_bytes
result[node_name]["available"] = node_capacity_bytes - node_usage_bytes
except ApiException as e:
msg = "Error while calling `metrics.k8s.io` API."
logging.error(msg)
logging.error(e)
return {"error": msg}
except ValueError as e:
# FIXME: after new Kubernetes release this should be not needed
msg = "Error while retreiving k8s list of nodes."
logging.error(msg)
logging.error(e)
return {"error": msg}

msg = "Error while calling `metrics.k8s.io` API."
logging.error(msg)
logging.error(e)
return {"error": msg}

return result

def get_available_memory(self):
Expand Down