ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-10-02 20:54:32 +02:00
Code Issues Packages Releases Activity

Refactor node repository

Browse Source
This commit is contained in:
Jan Eitzinger
2025-09-30 10:07:07 +02:00
parent 35c6ab4a08
commit 9485a463b8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/repository/node.go
View File

@@ -149,6 +149,7 @@ func (r *NodeRepository) GetNode(id int64, withMeta bool) (*schema.Node, error)
// cpus_allocated, cpus_total, memory_allocated, memory_total, gpus_allocated, gpus_total) // cpus_allocated, cpus_total, memory_allocated, memory_total, gpus_allocated, gpus_total)
// VALUES (:time_stamp, :hostname, :cluster, :subcluster, :node_state, :health_state, // VALUES (:time_stamp, :hostname, :cluster, :subcluster, :node_state, :health_state,
// :cpus_allocated, :cpus_total, :memory_allocated, :memory_total, :gpus_allocated, :gpus_total);` // :cpus_allocated, :cpus_total, :memory_allocated, :memory_total, :gpus_allocated, :gpus_total);`
const NamedNodeInsert string = ` const NamedNodeInsert string = `
INSERT INTO node (hostname, cluster, subcluster) INSERT INTO node (hostname, cluster, subcluster)
VALUES (:hostname, :cluster, :subcluster);` VALUES (:hostname, :cluster, :subcluster);`
@@ -190,8 +191,13 @@ func (r *NodeRepository) InsertNodeState(nodeState *schema.Node) error {
return nil return nil
} }
const NamedNodeStateInsert string = `
INSERT INTO node (hostname, cluster, subcluster)
VALUES (:hostname, :cluster, :subcluster);`
func (r *NodeRepository) UpdateNodeState(hostname string, cluster string, nodeState *schema.NodeState) error { func (r *NodeRepository) UpdateNodeState(hostname string, cluster string, nodeState *schema.NodeState) error {
var id int64 var id int64
if err := sq.Select("id").From("node"). if err := sq.Select("id").From("node").
Where("node.hostname = ?", hostname).Where("node.cluster = ?", cluster).RunWith(r.DB). Where("node.hostname = ?", hostname).Where("node.cluster = ?", cluster).RunWith(r.DB).
QueryRow().Scan(&id); err != nil { QueryRow().Scan(&id); err != nil {
@@ -205,7 +211,7 @@ func (r *NodeRepository) UpdateNodeState(hostname string, cluster string, nodeSt
Hostname: hostname, Cluster: cluster, SubCluster: subcluster, NodeState: *nodeState, Hostname: hostname, Cluster: cluster, SubCluster: subcluster, NodeState: *nodeState,
HealthState: schema.MonitoringStateFull, HealthState: schema.MonitoringStateFull,
} }
_, err = r.AddNode(&node) id, err = r.AddNode(&node)
if err != nil { if err != nil {
cclog.Errorf("Error while adding node '%s' to database: %v", hostname, err) cclog.Errorf("Error while adding node '%s' to database: %v", hostname, err)
return err return err
@@ -219,7 +225,7 @@ func (r *NodeRepository) UpdateNodeState(hostname string, cluster string, nodeSt
} }
} }
if _, err := sq.Update("node").Set("node_state", nodeState).Where("node.id = ?", id).RunWith(r.DB).Exec(); err != nil { if _, err := sq.Insert("node_state").Set("node_state", nodeState).Where("node.id = ?", id).RunWith(r.DB).Exec(); err != nil {
cclog.Errorf("error while updating node '%s'", hostname) cclog.Errorf("error while updating node '%s'", hostname)
return err return err
} }