ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-24 21:26:08 +02:00
Code Issues Packages Releases Activity

Minor fixes; Update frontend

Browse Source
This commit is contained in:
Lou Knauer
2022-03-30 09:39:13 +02:00
parent c28604b524
commit 27b3d78f6e
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend

Submodule frontend updated: 7344533214...5d90ff9a4a

8
graph/stats.go
View File

@@ -211,6 +211,10 @@ func (r *Resolver) rooflineHeatmap(ctx context.Context, filter []*model.JobFilte
} }
for _, job := range jobs { for _, job := range jobs {
if job.MonitoringStatus == schema.MonitoringStatusDisabled || job.MonitoringStatus == schema.MonitoringStatusArchivingFailed {
continue
}
jobdata, err := metricdata.LoadData(job, []string{"flops_any", "mem_bw"}, []schema.MetricScope{schema.MetricScopeNode}, ctx) jobdata, err := metricdata.LoadData(job, []string{"flops_any", "mem_bw"}, []schema.MetricScope{schema.MetricScopeNode}, ctx)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -270,6 +274,10 @@ func (r *queryResolver) jobsFootprints(ctx context.Context, filter []*model.JobF
nodehours := make([]schema.Float, 0, len(jobs)) nodehours := make([]schema.Float, 0, len(jobs))
for _, job := range jobs { for _, job := range jobs {
if job.MonitoringStatus == schema.MonitoringStatusDisabled || job.MonitoringStatus == schema.MonitoringStatusArchivingFailed {
continue
}
if err := metricdata.LoadAverages(job, metrics, avgs, ctx); err != nil { if err := metricdata.LoadAverages(job, metrics, avgs, ctx); err != nil {
return nil, err return nil, err
} }

2
test/api_test.go
View File

@@ -167,6 +167,7 @@ func TestRestApi(t *testing.T) {
"project": "testproj", "project": "testproj",
"cluster": "testcluster", "cluster": "testcluster",
"partition": "default", "partition": "default",
"walltime": 3600,
"arrayJobId": 0, "arrayJobId": 0,
"numNodes": 1, "numNodes": 1,
"numHwthreads": 8, "numHwthreads": 8,
@@ -217,6 +218,7 @@ func TestRestApi(t *testing.T) {
job.Cluster != "testcluster" || job.Cluster != "testcluster" ||
job.SubCluster != "sc1" || job.SubCluster != "sc1" ||
job.Partition != "default" || job.Partition != "default" ||
job.Walltime != 3600 ||
job.ArrayJobId != 0 || job.ArrayJobId != 0 ||
job.NumNodes != 1 || job.NumNodes != 1 ||
job.NumHWThreads != 8 || job.NumHWThreads != 8 ||