ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2026-02-20 09:47:30 +01:00
Code Issues Packages Releases Activity

Use alternative solution to deal with NULL values in health_state column

Browse Source
This commit is contained in:
Jan Eitzinger
2026-02-20 08:12:15 +01:00
parent 064aa0a238
commit abd11d783b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/repository/node.go
View File

@@ -274,7 +274,7 @@ type NodeStateWithNode struct {
func (r *NodeRepository) FindNodeStatesBefore(cutoff int64) ([]NodeStateWithNode, error) { func (r *NodeRepository) FindNodeStatesBefore(cutoff int64) ([]NodeStateWithNode, error) {
rows, err := sq.Select( rows, err := sq.Select(
"node_state.id", "node_state.time_stamp", "node_state.node_state", "node_state.id", "node_state.time_stamp", "node_state.node_state",
"node_state.health_state", "COALESCE(node_state.health_metrics, '')", "node_state.health_state", "node_state.health_metrics",
"node_state.cpus_allocated", "node_state.memory_allocated", "node_state.cpus_allocated", "node_state.memory_allocated",
"node_state.gpus_allocated", "node_state.jobs_running", "node_state.gpus_allocated", "node_state.jobs_running",
"node.hostname", "node.cluster", "node.subcluster", "node.hostname", "node.cluster", "node.subcluster",
@@ -293,13 +293,15 @@ func (r *NodeRepository) FindNodeStatesBefore(cutoff int64) ([]NodeStateWithNode
var result []NodeStateWithNode var result []NodeStateWithNode
for rows.Next() { for rows.Next() {
var ns NodeStateWithNode var ns NodeStateWithNode
var healthMetrics sql.NullString
if err := rows.Scan(&ns.ID, &ns.TimeStamp, &ns.NodeState, if err := rows.Scan(&ns.ID, &ns.TimeStamp, &ns.NodeState,
&ns.HealthState, &ns.HealthMetrics, &ns.HealthState, &healthMetrics,
&ns.CpusAllocated, &ns.MemoryAllocated, &ns.CpusAllocated, &ns.MemoryAllocated,
&ns.GpusAllocated, &ns.JobsRunning, &ns.GpusAllocated, &ns.JobsRunning,
&ns.Hostname, &ns.Cluster, &ns.SubCluster); err != nil { &ns.Hostname, &ns.Cluster, &ns.SubCluster); err != nil {
return nil, err return nil, err
} }
ns.HealthMetrics = healthMetrics.String
result = append(result, ns) result = append(result, ns)
} }
return result, nil return result, nil