ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 21:39:06 +01:00
Code Issues Packages Releases Activity

Change allocatedNodes; Update frontend

Browse Source
This commit is contained in:
Lou Knauer 2022-03-24 16:08:47 +01:00
parent 0b83917294
commit f3c2a6cc24
5 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend

@ -1 +1 @@
Subproject commit 03818be47032194f1f450ab242eed56a94a3c5d1 Subproject commit 239bf19c9a018b89db655d17c4e9adb8e64fb08e

8
graph/generated/generated.go
View File

@ -275,7 +275,7 @@ type QueryResolver interface {
Clusters(ctx context.Context) ([]*model.Cluster, error) Clusters(ctx context.Context) ([]*model.Cluster, error)
Tags(ctx context.Context) ([]*schema.Tag, error) Tags(ctx context.Context) ([]*schema.Tag, error)
User(ctx context.Context, username string) (*model.User, error) User(ctx context.Context, username string) (*model.User, error)
AllocatedNodes(ctx context.Context, cluster string) ([]string, error) AllocatedNodes(ctx context.Context, cluster string) ([]*model.Count, error)
Job(ctx context.Context, id string) (*schema.Job, error) Job(ctx context.Context, id string) (*schema.Job, error)
JobMetrics(ctx context.Context, id string, metrics []string, scopes []schema.MetricScope) ([]*model.JobMetricWithName, error) JobMetrics(ctx context.Context, id string, metrics []string, scopes []schema.MetricScope) ([]*model.JobMetricWithName, error)
JobsFootprints(ctx context.Context, filter []*model.JobFilter, metrics []string) (*model.Footprints, error) JobsFootprints(ctx context.Context, filter []*model.JobFilter, metrics []string) (*model.Footprints, error)
@ -1504,7 +1504,7 @@ type Query {
tags: [Tag!]! # List of all tags tags: [Tag!]! # List of all tags
user(username: String!): User user(username: String!): User
allocatedNodes(cluster: String!): [String!]! allocatedNodes(cluster: String!): [Count!]!
job(id: ID!): Job job(id: ID!): Job
jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!]): [JobMetricWithName!]! jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!]): [JobMetricWithName!]!
@ -5090,9 +5090,9 @@ func (ec *executionContext) _Query_allocatedNodes(ctx context.Context, field gra
} }
return graphql.Null return graphql.Null
} }
res := resTmp.([]string) res := resTmp.([]*model.Count)
fc.Result = res fc.Result = res
return ec.marshalNString2ᚕstringᚄ(ctx, field.Selections, res) return ec.marshalNCount2ᚕᚖgithubᚗcomᚋClusterCockpitᚋccᚑbackendᚋgraphᚋmodelᚐCountᚄ(ctx, field.Selections, res)
} }
func (ec *executionContext) _Query_job(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) { func (ec *executionContext) _Query_job(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {

2
graph/schema.graphqls
View File

@ -159,7 +159,7 @@ type Query {
tags: [Tag!]! # List of all tags tags: [Tag!]! # List of all tags
user(username: String!): User user(username: String!): User
allocatedNodes(cluster: String!): [String!]! allocatedNodes(cluster: String!): [Count!]!
job(id: ID!): Job job(id: ID!): Job
jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!]): [JobMetricWithName!]! jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!]): [JobMetricWithName!]!

17
graph/schema.resolvers.go
View File

@ -110,8 +110,21 @@ func (r *queryResolver) User(ctx context.Context, username string) (*model.User,
return auth.FetchUser(ctx, r.DB, username) return auth.FetchUser(ctx, r.DB, username)
} }
func (r *queryResolver) AllocatedNodes(ctx context.Context, cluster string) ([]string, error) { func (r *queryResolver) AllocatedNodes(ctx context.Context, cluster string) ([]*model.Count, error) {
return r.Repo.AllocatedNodes(cluster) data, err := r.Repo.AllocatedNodes(cluster)
if err != nil {
return nil, err
}
counts := make([]*model.Count, 0, len(data))
for subcluster, hosts := range data {
counts = append(counts, &model.Count{
Name: subcluster,
Count: len(hosts),
})
}
return counts, nil
} }
func (r *queryResolver) Job(ctx context.Context, id string) (*schema.Job, error) { func (r *queryResolver) Job(ctx context.Context, id string) (*schema.Job, error) {

21
repository/job.go
View File

@ -319,9 +319,11 @@ func (r *JobRepository) Partitions(cluster string) ([]string, error) {
return partitions.([]string), nil return partitions.([]string), nil
} }
func (r *JobRepository) AllocatedNodes(cluster string) ([]string, error) { // AllocatedNodes returns a map of all subclusters to a map of hostnames to the amount of jobs running on that host.
nodes := make(map[string]int) // Hosts with zero jobs running on them will not show up!
rows, err := sq.Select("resources").From("job"). func (r *JobRepository) AllocatedNodes(cluster string) (map[string]map[string]int, error) {
subclusters := make(map[string]map[string]int)
rows, err := sq.Select("resources", "subcluster").From("job").
Where("job.job_state = 'running'"). Where("job.job_state = 'running'").
Where("job.cluster = ?", cluster). Where("job.cluster = ?", cluster).
RunWith(r.stmtCache).Query() RunWith(r.stmtCache).Query()
@ -334,17 +336,24 @@ func (r *JobRepository) AllocatedNodes(cluster string) ([]string, error) {
for rows.Next() { for rows.Next() {
raw = raw[0:0] raw = raw[0:0]
var resources []*schema.Resource var resources []*schema.Resource
if err := rows.Scan(&raw); err != nil { var subcluster string
if err := rows.Scan(&raw, &subcluster); err != nil {
return nil, err return nil, err
} }
if err := json.Unmarshal(raw, &resources); err != nil { if err := json.Unmarshal(raw, &resources); err != nil {
return nil, err return nil, err
} }
hosts, ok := subclusters[subcluster]
if !ok {
hosts = make(map[string]int)
subclusters[subcluster] = hosts
}
for _, resource := range resources { for _, resource := range resources {
nodes[resource.Hostname] += 1 hosts[resource.Hostname] += 1
} }
} }
return nil, nil return subclusters, nil
} }