anobre/openshift-resource-governance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix JSON serialization issues with safe float conversion

Browse Source
This commit is contained in:
Anderson
2025-09-29 13:50:47 -03:00
parent 8307eeb646
commit 09ee5e009d
1 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/services/historical_analysis.py
View File

@@ -26,6 +26,16 @@ class HistoricalAnalysisService:
'30d': 2592000 # 30 days '30d': 2592000 # 30 days
} }
def _safe_float(self, value, default=0):
"""Safely convert value to float, handling inf and NaN"""
try:
result = float(value)
if result == float('inf') or result == float('-inf') or result != result: # NaN check
return default
return result
except (ValueError, TypeError):
return default
async def analyze_pod_historical_usage( async def analyze_pod_historical_usage(
self, self,
pod: PodResource, pod: PodResource,
@@ -209,8 +219,8 @@ class HistoricalAnalysisService:
return validations return validations
# Current values of requests/limits # Current values of requests/limits
current_requests = float(requests_data[0][1]) if requests_data else 0 current_requests = self._safe_float(requests_data[0][1]) if requests_data else 0
current_limits = float(limits_data[0][1]) if limits_data else 0 current_limits = self._safe_float(limits_data[0][1]) if limits_data else 0
# Usage statistics # Usage statistics
avg_usage = sum(usage_values) / len(usage_values) avg_usage = sum(usage_values) / len(usage_values)
@@ -294,8 +304,8 @@ class HistoricalAnalysisService:
return validations return validations
# Current values of requests/limits (in bytes) # Current values of requests/limits (in bytes)
current_requests = float(requests_data[0][1]) if requests_data else 0 current_requests = self._safe_float(requests_data[0][1]) if requests_data else 0
current_limits = float(limits_data[0][1]) if limits_data else 0 current_limits = self._safe_float(limits_data[0][1]) if limits_data else 0
# Usage statistics # Usage statistics
avg_usage = sum(usage_values) / len(usage_values) avg_usage = sum(usage_values) / len(usage_values)
@@ -449,12 +459,12 @@ class HistoricalAnalysisService:
return { return {
'time_range': time_range, 'time_range': time_range,
'cpu_usage': float(cpu_usage[0][1]) if cpu_usage else 0, 'cpu_usage': self._safe_float(cpu_usage[0][1]) if cpu_usage else 0,
'memory_usage': float(memory_usage[0][1]) if memory_usage else 0, 'memory_usage': self._safe_float(memory_usage[0][1]) if memory_usage else 0,
'cpu_requests': float(cpu_requests[0][1]) if cpu_requests else 0, 'cpu_requests': self._safe_float(cpu_requests[0][1]) if cpu_requests else 0,
'memory_requests': float(memory_requests[0][1]) if memory_requests else 0, 'memory_requests': self._safe_float(memory_requests[0][1]) if memory_requests else 0,
'cpu_utilization': (float(cpu_usage[0][1]) / float(cpu_requests[0][1]) * 100) if cpu_usage and cpu_requests and cpu_requests[0][1] != '0' else 0, 'cpu_utilization': (self._safe_float(cpu_usage[0][1]) / self._safe_float(cpu_requests[0][1]) * 100) if cpu_usage and cpu_requests and self._safe_float(cpu_requests[0][1]) != 0 else 0,
'memory_utilization': (float(memory_usage[0][1]) / float(memory_requests[0][1]) * 100) if memory_usage and memory_requests and memory_requests[0][1] != '0' else 0 'memory_utilization': (self._safe_float(memory_usage[0][1]) / self._safe_float(memory_requests[0][1]) * 100) if memory_usage and memory_requests and self._safe_float(memory_requests[0][1]) != 0 else 0
} }
except Exception as e: except Exception as e:
@@ -536,11 +546,11 @@ class HistoricalAnalysisService:
cpu_utilization = 0 cpu_utilization = 0
memory_utilization = 0 memory_utilization = 0
if cpu_usage and cpu_requests and cpu_requests[0][1] != '0': if cpu_usage and cpu_requests and self._safe_float(cpu_requests[0][1]) != 0:
cpu_utilization = (float(cpu_usage[0][1]) / float(cpu_requests[0][1])) * 100 cpu_utilization = (self._safe_float(cpu_usage[0][1]) / self._safe_float(cpu_requests[0][1])) * 100
if memory_usage and memory_requests and memory_requests[0][1] != '0': if memory_usage and memory_requests and self._safe_float(memory_requests[0][1]) != 0:
memory_utilization = (float(memory_usage[0][1]) / float(memory_requests[0][1])) * 100 memory_utilization = (self._safe_float(memory_usage[0][1]) / self._safe_float(memory_requests[0][1])) * 100
# Generate recommendations based on utilization # Generate recommendations based on utilization
recommendations = [] recommendations = []
@@ -578,10 +588,10 @@ class HistoricalAnalysisService:
return { return {
'namespace': namespace, 'namespace': namespace,
'time_range': time_range, 'time_range': time_range,
'cpu_usage': float(cpu_usage[0][1]) if cpu_usage else 0, 'cpu_usage': self._safe_float(cpu_usage[0][1]) if cpu_usage else 0,
'memory_usage': float(memory_usage[0][1]) if memory_usage else 0, 'memory_usage': self._safe_float(memory_usage[0][1]) if memory_usage else 0,
'cpu_requests': float(cpu_requests[0][1]) if cpu_requests else 0, 'cpu_requests': self._safe_float(cpu_requests[0][1]) if cpu_requests else 0,
'memory_requests': float(memory_requests[0][1]) if memory_requests else 0, 'memory_requests': self._safe_float(memory_requests[0][1]) if memory_requests else 0,
'cpu_utilization': cpu_utilization, 'cpu_utilization': cpu_utilization,
'memory_utilization': memory_utilization, 'memory_utilization': memory_utilization,
'pod_count': int(pod_count[0][1]) if pod_count else 0, 'pod_count': int(pod_count[0][1]) if pod_count else 0,
@@ -704,11 +714,11 @@ class HistoricalAnalysisService:
cpu_utilization = 0 cpu_utilization = 0
memory_utilization = 0 memory_utilization = 0
if cpu_usage and cpu_requests and cpu_requests[0][1] != '0': if cpu_usage and cpu_requests and self._safe_float(cpu_requests[0][1]) != 0:
cpu_utilization = (float(cpu_usage[0][1]) / float(cpu_requests[0][1])) * 100 cpu_utilization = (self._safe_float(cpu_usage[0][1]) / self._safe_float(cpu_requests[0][1])) * 100
if memory_usage and memory_requests and memory_requests[0][1] != '0': if memory_usage and memory_requests and self._safe_float(memory_requests[0][1]) != 0:
memory_utilization = (float(memory_usage[0][1]) / float(memory_requests[0][1])) * 100 memory_utilization = (self._safe_float(memory_usage[0][1]) / self._safe_float(memory_requests[0][1])) * 100
# Generate recommendations based on utilization # Generate recommendations based on utilization
recommendations = [] recommendations = []
@@ -747,12 +757,12 @@ class HistoricalAnalysisService:
'namespace': namespace, 'namespace': namespace,
'workload': workload, 'workload': workload,
'time_range': time_range, 'time_range': time_range,
'cpu_usage': float(cpu_usage[0][1]) if cpu_usage else 0, 'cpu_usage': self._safe_float(cpu_usage[0][1]) if cpu_usage else 0,
'memory_usage': float(memory_usage[0][1]) if memory_usage else 0, 'memory_usage': self._safe_float(memory_usage[0][1]) if memory_usage else 0,
'cpu_requests': float(cpu_requests[0][1]) if cpu_requests else 0, 'cpu_requests': self._safe_float(cpu_requests[0][1]) if cpu_requests else 0,
'memory_requests': float(memory_requests[0][1]) if memory_requests else 0, 'memory_requests': self._safe_float(memory_requests[0][1]) if memory_requests else 0,
'cpu_limits': float(cpu_limits[0][1]) if cpu_limits else 0, 'cpu_limits': self._safe_float(cpu_limits[0][1]) if cpu_limits else 0,
'memory_limits': float(memory_limits[0][1]) if memory_limits else 0, 'memory_limits': self._safe_float(memory_limits[0][1]) if memory_limits else 0,
'cpu_utilization': cpu_utilization, 'cpu_utilization': cpu_utilization,
'memory_utilization': memory_utilization, 'memory_utilization': memory_utilization,
'recommendations': recommendations 'recommendations': recommendations
@@ -842,11 +852,11 @@ class HistoricalAnalysisService:
cpu_utilization = 0 cpu_utilization = 0
memory_utilization = 0 memory_utilization = 0
if cpu_usage and cpu_requests and cpu_requests[0][1] != '0': if cpu_usage and cpu_requests and self._safe_float(cpu_requests[0][1]) != 0:
cpu_utilization = (float(cpu_usage[0][1]) / float(cpu_requests[0][1])) * 100 cpu_utilization = (self._safe_float(cpu_usage[0][1]) / self._safe_float(cpu_requests[0][1])) * 100
if memory_usage and memory_requests and memory_requests[0][1] != '0': if memory_usage and memory_requests and self._safe_float(memory_requests[0][1]) != 0:
memory_utilization = (float(memory_usage[0][1]) / float(memory_requests[0][1])) * 100 memory_utilization = (self._safe_float(memory_usage[0][1]) / self._safe_float(memory_requests[0][1])) * 100
# Generate recommendations based on utilization # Generate recommendations based on utilization
recommendations = [] recommendations = []
@@ -885,10 +895,10 @@ class HistoricalAnalysisService:
'namespace': namespace, 'namespace': namespace,
'pod_name': pod_name, 'pod_name': pod_name,
'time_range': time_range, 'time_range': time_range,
'cpu_usage': float(cpu_usage[0][1]) if cpu_usage else 0, 'cpu_usage': self._safe_float(cpu_usage[0][1]) if cpu_usage else 0,
'memory_usage': float(memory_usage[0][1]) if memory_usage else 0, 'memory_usage': self._safe_float(memory_usage[0][1]) if memory_usage else 0,
'cpu_requests': float(cpu_requests[0][1]) if cpu_requests else 0, 'cpu_requests': self._safe_float(cpu_requests[0][1]) if cpu_requests else 0,
'memory_requests': float(memory_requests[0][1]) if memory_requests else 0, 'memory_requests': self._safe_float(memory_requests[0][1]) if memory_requests else 0,
'cpu_utilization': cpu_utilization, 'cpu_utilization': cpu_utilization,
'memory_utilization': memory_utilization, 'memory_utilization': memory_utilization,
'container_count': int(container_count[0][1]) if container_count else 0, 'container_count': int(container_count[0][1]) if container_count else 0,