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

fix: multiple accs with identical label, cloned data for single acc

Browse Source 
- GPU id label in job view statistic table is always the same on multi GPU jobs #239
- Multiple accelerators listed in plot despite using only one #241
This commit is contained in:
Christoph Kluge 2024-03-22 16:10:30 +01:00
parent 60b56bd41a
commit 5a177c952d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/metricdata/cc-metric-store.go
View File

@ -206,7 +206,7 @@ func (ccms *CCMetricStore) LoadData(
jobData[metric][scope] = jobMetric jobData[metric][scope] = jobMetric
} }
for _, res := range row { for ndx, res := range row {
if res.Error != nil { if res.Error != nil {
/* Build list for "partial errors", if any */ /* Build list for "partial errors", if any */
errors = append(errors, fmt.Sprintf("failed to fetch '%s' from host '%s': %s", query.Metric, query.Hostname, *res.Error)) errors = append(errors, fmt.Sprintf("failed to fetch '%s' from host '%s': %s", query.Metric, query.Hostname, *res.Error))
@ -216,7 +216,7 @@ func (ccms *CCMetricStore) LoadData(
id := (*string)(nil) id := (*string)(nil)
if query.Type != nil { if query.Type != nil {
id = new(string) id = new(string)
*id = query.TypeIds[0] *id = query.TypeIds[ndx]
} }
if res.Avg.IsNaN() || res.Min.IsNaN() || res.Max.IsNaN() { if res.Avg.IsNaN() || res.Min.IsNaN() || res.Max.IsNaN() {
@ -313,6 +313,11 @@ func (ccms *CCMetricStore) buildQueries(
// Accelerator -> Accelerator (Use "accelerator" scope if requested scope is lower than node) // Accelerator -> Accelerator (Use "accelerator" scope if requested scope is lower than node)
if nativeScope == schema.MetricScopeAccelerator && scope.LT(schema.MetricScopeNode) { if nativeScope == schema.MetricScopeAccelerator && scope.LT(schema.MetricScopeNode) {
if scope != schema.MetricScopeAccelerator {
// Skip all other catched cases
continue
}
queries = append(queries, ApiQuery{ queries = append(queries, ApiQuery{
Metric: remoteName, Metric: remoteName,
Hostname: host.Hostname, Hostname: host.Hostname,