ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-09-20 03:17:26 +02:00
Code Issues Packages Releases Activity

adapt core timeweight to sqlite name logic

Browse Source
This commit is contained in:
Christoph Kluge 2023-08-24 12:56:35 +02:00
parent 4eceab4dc7
commit 28609a3372
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
internal/graph/util.go
View File

@ -13,9 +13,9 @@ import (
"github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql"
"github.com/ClusterCockpit/cc-backend/internal/graph/model" "github.com/ClusterCockpit/cc-backend/internal/graph/model"
"github.com/ClusterCockpit/cc-backend/internal/metricdata" "github.com/ClusterCockpit/cc-backend/internal/metricdata"
"github.com/ClusterCockpit/cc-backend/pkg/archive"
"github.com/ClusterCockpit/cc-backend/pkg/log" "github.com/ClusterCockpit/cc-backend/pkg/log"
"github.com/ClusterCockpit/cc-backend/pkg/schema" "github.com/ClusterCockpit/cc-backend/pkg/schema"
// "github.com/ClusterCockpit/cc-backend/pkg/archive"
) )
const MAX_JOBS_FOR_ANALYSIS = 500 const MAX_JOBS_FOR_ANALYSIS = 500
@ -130,7 +130,7 @@ func (r *queryResolver) jobsFootprints(ctx context.Context, filter []*model.JobF
timeweights.AccHours = append(timeweights.AccHours, schema.Float(1.0)) timeweights.AccHours = append(timeweights.AccHours, schema.Float(1.0))
} }
if job.NumHWThreads > 0 { if job.NumHWThreads > 0 {
timeweights.CoreHours = append(timeweights.CoreHours, schema.Float(float64(job.Duration)/60.0*float64(numCoresForJob(job)))) timeweights.CoreHours = append(timeweights.CoreHours, schema.Float(float64(job.Duration)/60.0*float64(job.NumHWThreads))) // SQLite HWThreads == Cores; numCoresForJob(job)
} else { } else {
timeweights.CoreHours = append(timeweights.CoreHours, schema.Float(1.0)) timeweights.CoreHours = append(timeweights.CoreHours, schema.Float(1.0))
} }
@ -150,28 +150,28 @@ func (r *queryResolver) jobsFootprints(ctx context.Context, filter []*model.JobF
}, nil }, nil
} }
func numCoresForJob(job *schema.Job) (numCores int) { // func numCoresForJob(job *schema.Job) (numCores int) {
subcluster, scerr := archive.GetSubCluster(job.Cluster, job.SubCluster) // subcluster, scerr := archive.GetSubCluster(job.Cluster, job.SubCluster)
if scerr != nil { // if scerr != nil {
return 1 // return 1
} // }
totalJobCores := 0 // totalJobCores := 0
topology := subcluster.Topology // topology := subcluster.Topology
for _, host := range job.Resources { // for _, host := range job.Resources {
hwthreads := host.HWThreads // hwthreads := host.HWThreads
if hwthreads == nil { // if hwthreads == nil {
hwthreads = topology.Node // hwthreads = topology.Node
} // }
hostCores, _ := topology.GetCoresFromHWThreads(hwthreads) // hostCores, _ := topology.GetCoresFromHWThreads(hwthreads)
totalJobCores += len(hostCores) // totalJobCores += len(hostCores)
} // }
return totalJobCores // return totalJobCores
} // }
func requireField(ctx context.Context, name string) bool { func requireField(ctx context.Context, name string) bool {
fields := graphql.CollectAllFields(ctx) fields := graphql.CollectAllFields(ctx)