ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-11-01 00:15:05 +01:00
Code Issues Packages Releases Activity

adapt status node query resolution to new node_state table

Browse Source
This commit is contained in:
Christoph Kluge
2025-10-14 18:45:05 +02:00
parent 4131665284
commit 5908ae7905
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
internal/repository/node.go
View File

@@ -49,11 +49,8 @@ func GetNodeRepository() *NodeRepository {
return nodeRepoInstance return nodeRepoInstance
} }
var nodeColumns []string = []string{ // "node.id,", "node.meta_data"
// "node.id," var nodeColumns []string = []string{"node.hostname", "node.cluster", "node.subcluster"}
"node.hostname", "node.cluster", "node.subcluster",
"node.node_state", "node.health_state", // "node.meta_data",
}
func (r *NodeRepository) FetchMetadata(node *schema.Node) (map[string]string, error) { func (r *NodeRepository) FetchMetadata(node *schema.Node) (map[string]string, error) {
start := time.Now() start := time.Now()
@@ -195,6 +192,7 @@ const NamedNodeStateInsert string = `
INSERT INTO node (hostname, cluster, subcluster) INSERT INTO node (hostname, cluster, subcluster)
VALUES (:hostname, :cluster, :subcluster);` VALUES (:hostname, :cluster, :subcluster);`
// Outdated?
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
@@ -262,6 +260,10 @@ func (r *NodeRepository) QueryNodes(
return nil, qerr return nil, qerr
} }
// Get latest Info aka closest Timestamp to $now
now := time.Now().Unix()
query = query.Join("node_state ON node_state.node_id = node.id").Where(sq.Gt{"node_state.time_stamp": (now - 60)}) // .Distinct()
for _, f := range filters { for _, f := range filters {
if f.Hostname != nil { if f.Hostname != nil {
query = buildStringCondition("node.hostname", f.Hostname, query) query = buildStringCondition("node.hostname", f.Hostname, query)
@@ -304,12 +306,16 @@ func (r *NodeRepository) QueryNodes(
} }
func (r *NodeRepository) ListNodes(cluster string) ([]*schema.Node, error) { func (r *NodeRepository) ListNodes(cluster string) ([]*schema.Node, error) {
q := sq.Select("hostname", "cluster", "subcluster", "node_state", // Get latest Info aka closest Timestamo to $now
"health_state").From("node").Where("node.cluster = ?", cluster).OrderBy("node.hostname ASC") now := time.Now().Unix()
q := sq.Select("hostname", "cluster", "subcluster", "node_state", "health_state").
From("node").
Join("node_state ON node_state.node_id = node.id").Where(sq.Gt{"node_state.time_stamp": (now - 60)}).
Where("node.cluster = ?", cluster).OrderBy("node.hostname ASC")
rows, err := q.RunWith(r.DB).Query() rows, err := q.RunWith(r.DB).Query()
if err != nil { if err != nil {
cclog.Warn("Error while querying user list") cclog.Warn("Error while querying node list")
return nil, err return nil, err
} }
nodeList := make([]*schema.Node, 0, 100) nodeList := make([]*schema.Node, 0, 100)
@@ -329,11 +335,15 @@ func (r *NodeRepository) ListNodes(cluster string) ([]*schema.Node, error) {
} }
func (r *NodeRepository) CountNodeStates(ctx context.Context, filters []*model.NodeFilter) ([]*model.NodeStates, error) { func (r *NodeRepository) CountNodeStates(ctx context.Context, filters []*model.NodeFilter) ([]*model.NodeStates, error) {
query, qerr := AccessCheck(ctx, sq.Select("node_state AS state", "count(*) AS count").From("node")) query, qerr := AccessCheck(ctx, sq.Select("node_state", "count(*) AS count").From("node"))
if qerr != nil { if qerr != nil {
return nil, qerr return nil, qerr
} }
// Get latest Info aka closest Timestamp to $now
now := time.Now().Unix()
query = query.Join("node_state ON node_state.node_id = node.id").Where(sq.Gt{"node_state.time_stamp": (now - 60)}) // .Distinct()
for _, f := range filters { for _, f := range filters {
if f.Hostname != nil { if f.Hostname != nil {
query = buildStringCondition("node.hostname", f.Hostname, query) query = buildStringCondition("node.hostname", f.Hostname, query)
@@ -353,7 +363,7 @@ func (r *NodeRepository) CountNodeStates(ctx context.Context, filters []*model.N
} }
// Add Group and Order // Add Group and Order
query = query.GroupBy("state").OrderBy("count DESC") query = query.GroupBy("node_state").OrderBy("count DESC")
rows, err := query.RunWith(r.stmtCache).Query() rows, err := query.RunWith(r.stmtCache).Query()
if err != nil { if err != nil {
@@ -378,11 +388,15 @@ func (r *NodeRepository) CountNodeStates(ctx context.Context, filters []*model.N
} }
func (r *NodeRepository) CountHealthStates(ctx context.Context, filters []*model.NodeFilter) ([]*model.NodeStates, error) { func (r *NodeRepository) CountHealthStates(ctx context.Context, filters []*model.NodeFilter) ([]*model.NodeStates, error) {
query, qerr := AccessCheck(ctx, sq.Select("health_state AS state", "count(*) AS count").From("node")) query, qerr := AccessCheck(ctx, sq.Select("health_state", "count(*) AS count").From("node"))
if qerr != nil { if qerr != nil {
return nil, qerr return nil, qerr
} }
// Get latest Info aka closest Timestamp to $now
now := time.Now().Unix()
query = query.Join("node_state ON node_state.node_id = node.id").Where(sq.Gt{"node_state.time_stamp": (now - 60)}) // .Distinct()
for _, f := range filters { for _, f := range filters {
if f.Hostname != nil { if f.Hostname != nil {
query = buildStringCondition("node.hostname", f.Hostname, query) query = buildStringCondition("node.hostname", f.Hostname, query)
@@ -402,7 +416,7 @@ func (r *NodeRepository) CountHealthStates(ctx context.Context, filters []*model
} }
// Add Group and Order // Add Group and Order
query = query.GroupBy("state").OrderBy("count DESC") query = query.GroupBy("health_state").OrderBy("count DESC")
rows, err := query.RunWith(r.stmtCache).Query() rows, err := query.RunWith(r.stmtCache).Query()
if err != nil { if err != nil {