allow /start_job/ with 0 second duration

Apparently it is possible to get this for very short jobs.

.gitignore

@@ -1,21 +1,23 @@
 /cc-backend
-
-/var/job-archive
-/var/*.db
-/var/machine-state
-
 /.env
 /config.json
 
+/var/job-archive
+/var/machine-state
+/var/job.db-shm
+/var/job.db-wal
+/var/*.db
+/var/*.txt
+
 /web/frontend/public/build
 /web/frontend/node_modules
-/.vscode/*
+
 /archive-migration
 /archive-manager
-var/job.db-shm
-var/job.db-wal
 
+/internal/repository/testdata/job.db-shm
+/internal/repository/testdata/job.db-wal
+
+/.vscode/*
 dist/
 *.db
-internal/repository/testdata/job.db-shm
-internal/repository/testdata/job.db-wal

Makefile

@@ -82,7 +82,7 @@ tags:
 	@ctags -R
 
 $(VAR):
-	@mkdir $(VAR)
+	@mkdir -p $(VAR)
 
 config.json:
 	$(info ===>  Initialize config.json file)

api/swagger.json

@@ -202,7 +202,7 @@
                     "200": {
                         "description": "Success message",
                         "schema": {
-                            "$ref": "#/definitions/api.DeleteJobApiResponse"
+                            "$ref": "#/definitions/api.DefaultJobApiResponse"
                         }
                     },
                     "400": {
@@ -272,7 +272,7 @@
                     "200": {
                         "description": "Success message",
                         "schema": {
-                            "$ref": "#/definitions/api.DeleteJobApiResponse"
+                            "$ref": "#/definitions/api.DefaultJobApiResponse"
                         }
                     },
                     "400": {
@@ -342,7 +342,7 @@
                     "200": {
                         "description": "Success message",
                         "schema": {
-                            "$ref": "#/definitions/api.DeleteJobApiResponse"
+                            "$ref": "#/definitions/api.DefaultJobApiResponse"
                         }
                     },
                     "400": {
@@ -487,7 +487,7 @@
                     "201": {
                         "description": "Job added successfully",
                         "schema": {
-                            "$ref": "#/definitions/api.StartJobApiResponse"
+                            "$ref": "#/definitions/api.DefaultJobApiResponse"
                         }
                     },
                     "400": {
@@ -581,7 +581,7 @@
                         }
                     },
                     "422": {
-                        "description": "Unprocessable Entity: finding job failed: sql: no rows in result set",
+                        "description": "Unprocessable Entity: job has already been stopped",
                         "schema": {
                             "$ref": "#/definitions/api.ErrorResponse"
                         }
@@ -827,6 +827,72 @@
                 }
             }
         },
+        "/notice/": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "Modifies the content of notice.txt, shown as notice box on the homepage.\nIf more than one formValue is set then only the highest priority field is used.\nOnly accessible from IPs registered with apiAllowedIPs configuration option.",
+                "consumes": [
+                    "multipart/form-data"
+                ],
+                "produces": [
+                    "text/plain"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "Updates or empties the notice box content",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Priority 1: New content to display",
+                        "name": "new-content",
+                        "in": "formData"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success Response Message",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "422": {
+                        "description": "Unprocessable Entity: The user could not be updated",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/user/{id}": {
             "post": {
                 "security": [
@@ -1207,6 +1273,14 @@
                 }
             }
         },
+        "api.DefaultJobApiResponse": {
+            "type": "object",
+            "properties": {
+                "msg": {
+                    "type": "string"
+                }
+            }
+        },
         "api.DeleteJobApiRequest": {
             "type": "object",
             "required": [
@@ -1230,14 +1304,6 @@
                 }
             }
         },
-        "api.DeleteJobApiResponse": {
-            "type": "object",
-            "properties": {
-                "msg": {
-                    "type": "string"
-                }
-            }
-        },
         "api.EditMetaRequest": {
             "type": "object",
             "properties": {
@@ -1324,14 +1390,6 @@
                 }
             }
         },
-        "api.StartJobApiResponse": {
-            "type": "object",
-            "properties": {
-                "msg": {
-                    "type": "string"
-                }
-            }
-        },
         "api.StopJobApiRequest": {
             "type": "object",
             "required": [

api/swagger.yaml

@@ -32,6 +32,11 @@ definitions:
         example: Debug
         type: string
     type: object
+  api.DefaultJobApiResponse:
+    properties:
+      msg:
+        type: string
+    type: object
   api.DeleteJobApiRequest:
     properties:
       cluster:
@@ -49,11 +54,6 @@ definitions:
     required:
     - jobId
     type: object
-  api.DeleteJobApiResponse:
-    properties:
-      msg:
-        type: string
-    type: object
   api.EditMetaRequest:
     properties:
       key:
@@ -112,11 +112,6 @@ definitions:
       scope:
         $ref: '#/definitions/schema.MetricScope'
     type: object
-  api.StartJobApiResponse:
-    properties:
-      msg:
-        type: string
-    type: object
   api.StopJobApiRequest:
     properties:
       cluster:
@@ -906,7 +901,7 @@ paths:
         "200":
           description: Success message
           schema:
-            $ref: '#/definitions/api.DeleteJobApiResponse'
+            $ref: '#/definitions/api.DefaultJobApiResponse'
         "400":
           description: Bad Request
           schema:
@@ -953,7 +948,7 @@ paths:
         "200":
           description: Success message
           schema:
-            $ref: '#/definitions/api.DeleteJobApiResponse'
+            $ref: '#/definitions/api.DefaultJobApiResponse'
         "400":
           description: Bad Request
           schema:
@@ -1000,7 +995,7 @@ paths:
         "200":
           description: Success message
           schema:
-            $ref: '#/definitions/api.DeleteJobApiResponse'
+            $ref: '#/definitions/api.DefaultJobApiResponse'
         "400":
           description: Bad Request
           schema:
@@ -1098,7 +1093,7 @@ paths:
         "201":
           description: Job added successfully
           schema:
-            $ref: '#/definitions/api.StartJobApiResponse'
+            $ref: '#/definitions/api.DefaultJobApiResponse'
         "400":
           description: Bad Request
           schema:
@@ -1161,8 +1156,7 @@ paths:
           schema:
             $ref: '#/definitions/api.ErrorResponse'
         "422":
-          description: 'Unprocessable Entity: finding job failed: sql: no rows in
+          description: 'Unprocessable Entity: job has already been stopped'
-            result set'
           schema:
             $ref: '#/definitions/api.ErrorResponse'
         "500":
@@ -1224,6 +1218,51 @@ paths:
       summary: Adds one or more tags to a job
       tags:
       - Job add and modify
+  /notice/:
+    post:
+      consumes:
+      - multipart/form-data
+      description: |-
+        Modifies the content of notice.txt, shown as notice box on the homepage.
+        If more than one formValue is set then only the highest priority field is used.
+        Only accessible from IPs registered with apiAllowedIPs configuration option.
+      parameters:
+      - description: 'Priority 1: New content to display'
+        in: formData
+        name: new-content
+        type: string
+      produces:
+      - text/plain
+      responses:
+        "200":
+          description: Success Response Message
+          schema:
+            type: string
+        "400":
+          description: Bad Request
+          schema:
+            type: string
+        "401":
+          description: Unauthorized
+          schema:
+            type: string
+        "403":
+          description: Forbidden
+          schema:
+            type: string
+        "422":
+          description: 'Unprocessable Entity: The user could not be updated'
+          schema:
+            type: string
+        "500":
+          description: Internal Server Error
+          schema:
+            type: string
+      security:
+      - ApiKeyAuth: []
+      summary: Updates or empties the notice box content
+      tags:
+      - User
   /user/{id}:
     post:
       consumes:

internal/api/docs.go

@@ -208,7 +208,7 @@ const docTemplate = `{
                     "200": {
                         "description": "Success message",
                         "schema": {
-                            "$ref": "#/definitions/api.DeleteJobApiResponse"
+                            "$ref": "#/definitions/api.DefaultJobApiResponse"
                         }
                     },
                     "400": {
@@ -278,7 +278,7 @@ const docTemplate = `{
                     "200": {
                         "description": "Success message",
                         "schema": {
-                            "$ref": "#/definitions/api.DeleteJobApiResponse"
+                            "$ref": "#/definitions/api.DefaultJobApiResponse"
                         }
                     },
                     "400": {
@@ -348,7 +348,7 @@ const docTemplate = `{
                     "200": {
                         "description": "Success message",
                         "schema": {
-                            "$ref": "#/definitions/api.DeleteJobApiResponse"
+                            "$ref": "#/definitions/api.DefaultJobApiResponse"
                         }
                     },
                     "400": {
@@ -493,7 +493,7 @@ const docTemplate = `{
                     "201": {
                         "description": "Job added successfully",
                         "schema": {
-                            "$ref": "#/definitions/api.StartJobApiResponse"
+                            "$ref": "#/definitions/api.DefaultJobApiResponse"
                         }
                     },
                     "400": {
@@ -587,7 +587,7 @@ const docTemplate = `{
                         }
                     },
                     "422": {
-                        "description": "Unprocessable Entity: finding job failed: sql: no rows in result set",
+                        "description": "Unprocessable Entity: job has already been stopped",
                         "schema": {
                             "$ref": "#/definitions/api.ErrorResponse"
                         }
@@ -833,6 +833,72 @@ const docTemplate = `{
                 }
             }
         },
+        "/notice/": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "description": "Modifies the content of notice.txt, shown as notice box on the homepage.\nIf more than one formValue is set then only the highest priority field is used.\nOnly accessible from IPs registered with apiAllowedIPs configuration option.",
+                "consumes": [
+                    "multipart/form-data"
+                ],
+                "produces": [
+                    "text/plain"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "Updates or empties the notice box content",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Priority 1: New content to display",
+                        "name": "new-content",
+                        "in": "formData"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success Response Message",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "422": {
+                        "description": "Unprocessable Entity: The user could not be updated",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/user/{id}": {
             "post": {
                 "security": [
@@ -1213,6 +1279,14 @@ const docTemplate = `{
                 }
             }
         },
+        "api.DefaultJobApiResponse": {
+            "type": "object",
+            "properties": {
+                "msg": {
+                    "type": "string"
+                }
+            }
+        },
         "api.DeleteJobApiRequest": {
             "type": "object",
             "required": [
@@ -1236,14 +1310,6 @@ const docTemplate = `{
                 }
             }
         },
-        "api.DeleteJobApiResponse": {
-            "type": "object",
-            "properties": {
-                "msg": {
-                    "type": "string"
-                }
-            }
-        },
         "api.EditMetaRequest": {
             "type": "object",
             "properties": {
@@ -1330,14 +1396,6 @@ const docTemplate = `{
                 }
             }
         },
-        "api.StartJobApiResponse": {
-            "type": "object",
-            "properties": {
-                "msg": {
-                    "type": "string"
-                }
-            }
-        },
         "api.StopJobApiRequest": {
             "type": "object",
             "required": [

internal/api/rest.go

@@ -757,7 +757,7 @@ func (api *RestApi) tagJob(rw http.ResponseWriter, r *http.Request) {
 // @accept      json
 // @produce     json
 // @param       request body     schema.JobMeta          true "Job to add"
-// @success     201     {object} api.StartJobApiResponse      "Job added successfully"
+// @success     201     {object} api.DefaultJobApiResponse    "Job added successfully"
 // @failure     400     {object} api.ErrorResponse            "Bad Request"
 // @failure     401     {object} api.ErrorResponse            "Unauthorized"
 // @failure     403     {object} api.ErrorResponse            "Forbidden"
@@ -772,9 +772,8 @@ func (api *RestApi) startJob(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if req.State == "" {
+	req.State = schema.JobStateRunning
-		req.State = schema.JobStateRunning
+
-	}
 	if err := importer.SanityChecks(&req.BaseJob); err != nil {
 		handleError(err, http.StatusBadRequest, rw)
 		return
@@ -835,7 +834,7 @@ func (api *RestApi) startJob(rw http.ResponseWriter, r *http.Request) {
 // @failure     401     {object} api.ErrorResponse          "Unauthorized"
 // @failure     403     {object} api.ErrorResponse          "Forbidden"
 // @failure     404     {object} api.ErrorResponse          "Resource not found"
-// @failure     422     {object} api.ErrorResponse          "Unprocessable Entity: finding job failed: sql: no rows in result set"
+// @failure     422     {object} api.ErrorResponse          "Unprocessable Entity: job has already been stopped"
 // @failure     500     {object} api.ErrorResponse          "Internal Server Error"
 // @security    ApiKeyAuth
 // @router      /jobs/stop_job/ [post]
@@ -871,7 +870,7 @@ func (api *RestApi) stopJobByRequest(rw http.ResponseWriter, r *http.Request) {
 // @description Job to remove is specified by database ID. This will not remove the job from the job archive.
 // @produce     json
 // @param       id      path     int                   true "Database ID of Job"
-// @success     200     {object} api.DeleteJobApiResponse     "Success message"
+// @success     200     {object} api.DefaultJobApiResponse  "Success message"
 // @failure     400     {object} api.ErrorResponse          "Bad Request"
 // @failure     401     {object} api.ErrorResponse          "Unauthorized"
 // @failure     403     {object} api.ErrorResponse          "Forbidden"
@@ -914,7 +913,7 @@ func (api *RestApi) deleteJobById(rw http.ResponseWriter, r *http.Request) {
 // @accept      json
 // @produce     json
 // @param       request body     api.DeleteJobApiRequest true "All fields required"
-// @success     200     {object} api.DeleteJobApiResponse     "Success message"
+// @success     200     {object} api.DefaultJobApiResponse  "Success message"
 // @failure     400     {object} api.ErrorResponse          "Bad Request"
 // @failure     401     {object} api.ErrorResponse          "Unauthorized"
 // @failure     403     {object} api.ErrorResponse          "Forbidden"
@@ -964,7 +963,7 @@ func (api *RestApi) deleteJobByRequest(rw http.ResponseWriter, r *http.Request)
 // @description Remove all jobs with start time before timestamp. The jobs will not be removed from the job archive.
 // @produce     json
 // @param       ts      path     int                   true "Unix epoch timestamp"
-// @success     200     {object} api.DeleteJobApiResponse     "Success message"
+// @success     200     {object} api.DefaultJobApiResponse  "Success message"
 // @failure     400     {object} api.ErrorResponse          "Bad Request"
 // @failure     401     {object} api.ErrorResponse          "Unauthorized"
 // @failure     403     {object} api.ErrorResponse          "Forbidden"
@@ -1004,8 +1003,13 @@ func (api *RestApi) deleteJobBefore(rw http.ResponseWriter, r *http.Request) {
 
 func (api *RestApi) checkAndHandleStopJob(rw http.ResponseWriter, job *schema.Job, req StopJobApiRequest) {
 	// Sanity checks
-	if job == nil || job.StartTime.Unix() >= req.StopTime || job.State != schema.JobStateRunning {
+	if job.State != schema.JobStateRunning {
-		handleError(fmt.Errorf("jobId %d (id %d) on %s : stopTime %d must be larger than startTime %d and only running jobs can be stopped (state is: %s)", job.JobID, job.ID, job.Cluster, req.StopTime, job.StartTime.Unix(), job.State), http.StatusBadRequest, rw)
+		handleError(fmt.Errorf("jobId %d (id %d) on %s : job has already been stopped (state is: %s)", job.JobID, job.ID, job.Cluster, job.State), http.StatusUnprocessableEntity, rw)
+		return
+	}
+
+	if job == nil || job.StartTime.Unix() > req.StopTime {
+		handleError(fmt.Errorf("jobId %d (id %d) on %s : stopTime %d must be larger/equal than startTime %d", job.JobID, job.ID, job.Cluster, req.StopTime, job.StartTime.Unix()), http.StatusBadRequest, rw)
 		return
 	}
 

internal/archiver/archiver.go

@@ -60,12 +60,13 @@ func ArchiveJob(job *schema.Job, ctx context.Context) (*schema.JobMeta, error) {
 			max = math.Max(max, series.Statistics.Max)
 		}
 
+		// Round AVG Result to 2 Digits
 		jobMeta.Statistics[metric] = schema.JobStatistics{
 			Unit: schema.Unit{
 				Prefix: archive.GetMetricConfig(job.Cluster, metric).Unit.Prefix,
 				Base:   archive.GetMetricConfig(job.Cluster, metric).Unit.Base,
 			},
-			Avg: avg / float64(job.NumNodes),
+			Avg: (math.Round((avg/float64(job.NumNodes))*100) / 100),
 			Min: min,
 			Max: max,
 		}

internal/graph/schema.resolvers.go

@@ -303,6 +303,7 @@ func (r *queryResolver) JobMetrics(ctx context.Context, id string, metrics []str
 
 // JobsFootprints is the resolver for the jobsFootprints field.
 func (r *queryResolver) JobsFootprints(ctx context.Context, filter []*model.JobFilter, metrics []string) (*model.Footprints, error) {
+	// NOTE: Legacy Naming! This resolver is for normalized histograms in analysis view only - *Not* related to DB "footprint" column!
 	return r.jobsFootprints(ctx, filter, metrics)
 }
 

internal/metricDataDispatcher/dataLoader.go

@@ -170,6 +170,9 @@ func LoadData(job *schema.Job,
 			jd.AddNodeScope("mem_bw")
 		}
 
+		// Round Resulting Stat Values
+		jd.RoundMetricStats()
+
 		return jd, ttl, size
 	})
 

internal/metricdata/cc-metric-store.go

@@ -440,6 +440,23 @@ func (ccms *CCMetricStore) buildQueries(
 					continue
 				}
 
+				// Core -> Socket
+				if nativeScope == schema.MetricScopeCore && scope == schema.MetricScopeSocket {
+					sockets, _ := topology.GetSocketsFromCores(hwthreads)
+					for _, socket := range sockets {
+						queries = append(queries, ApiQuery{
+							Metric:     remoteName,
+							Hostname:   host.Hostname,
+							Aggregate:  true,
+							Type:       &coreString,
+							TypeIds:    intToStringSlice(topology.Socket[socket]),
+							Resolution: resolution,
+						})
+						assignedScope = append(assignedScope, scope)
+					}
+					continue
+				}
+
 				// Core -> Node
 				if nativeScope == schema.MetricScopeCore && scope == schema.MetricScopeNode {
 					cores, _ := topology.GetCoresFromHWThreads(hwthreads)
@@ -627,7 +644,7 @@ func (ccms *CCMetricStore) LoadNodeData(
 				req.Queries = append(req.Queries, ApiQuery{
 					Hostname:   node,
 					Metric:     ccms.toRemoteName(metric),
-					Resolution: 60, // Default for Node Queries
+					Resolution: 0, // Default for Node Queries: Will return metric $Timestep Resolution
 				})
 			}
 		}
@@ -1038,6 +1055,23 @@ func (ccms *CCMetricStore) buildNodeQueries(
 					continue
 				}
 
+				// Core -> Socket
+				if nativeScope == schema.MetricScopeCore && scope == schema.MetricScopeSocket {
+					sockets, _ := topology.GetSocketsFromCores(topology.Node)
+					for _, socket := range sockets {
+						queries = append(queries, ApiQuery{
+							Metric:     remoteName,
+							Hostname:   hostname,
+							Aggregate:  true,
+							Type:       &coreString,
+							TypeIds:    intToStringSlice(topology.Socket[socket]),
+							Resolution: resolution,
+						})
+						assignedScope = append(assignedScope, scope)
+					}
+					continue
+				}
+
 				// Core -> Node
 				if nativeScope == schema.MetricScopeCore && scope == schema.MetricScopeNode {
 					cores, _ := topology.GetCoresFromHWThreads(topology.Node)

internal/repository/job.go

@@ -217,11 +217,6 @@ func (r *JobRepository) UpdateMetadata(job *schema.Job, key, val string) (err er
 
 func (r *JobRepository) FetchFootprint(job *schema.Job) (map[string]float64, error) {
 	start := time.Now()
-	cachekey := fmt.Sprintf("footprint:%d", job.ID)
-	if cached := r.cache.Get(cachekey, nil); cached != nil {
-		job.Footprint = cached.(map[string]float64)
-		return job.Footprint, nil
-	}
 
 	if err := sq.Select("job.footprint").From("job").Where("job.id = ?", job.ID).
 		RunWith(r.stmtCache).QueryRow().Scan(&job.RawFootprint); err != nil {
@@ -238,7 +233,6 @@ func (r *JobRepository) FetchFootprint(job *schema.Job) (map[string]float64, err
 		return nil, err
 	}
 
-	r.cache.Put(cachekey, job.Footprint, len(job.Footprint), 24*time.Hour)
 	log.Debugf("Timer FetchFootprint %s", time.Since(start))
 	return job.Footprint, nil
 }
@@ -606,8 +600,11 @@ func (r *JobRepository) UpdateEnergy(
 				// FIXME: Needs sum as stats type
 			} else if sc.MetricConfig[i].Energy == "power" { // this metric has power as unit (Watt)
 				// Energy: Power (in Watts) * Time (in Seconds)
-				// Unit: ( W * s ) / 3600 / 1000 = kWh ; Rounded to 2 nearest digits
+				// Unit: (( W * s ) / 3600) / 1000 = kWh ; Rounded to 2 nearest digits: (Energy * 100) / 100
-				energy = math.Round(((LoadJobStat(jobMeta, fp, "avg")*float64(jobMeta.Duration))/3600/1000)*100) / 100
+				// Here: All-Node Metric Average * Number of Nodes * Job Runtime
+				// Note: Shared Jobs handled correctly since "Node Average" is based on partial resources, while "numNodes" factor is 1
+				metricNodeSum := LoadJobStat(jobMeta, fp, "avg") * float64(jobMeta.NumNodes) * float64(jobMeta.Duration)
+				energy = math.Round(((metricNodeSum/3600)/1000)*100) / 100
 			}
 		} else {
 			log.Warnf("Error while collecting energy metric %s for job, DB ID '%v', return '0.0'", fp, jobMeta.ID)

internal/repository/jobQuery.go

@@ -176,6 +176,9 @@ func BuildWhereClause(filter *model.JobFilter, query sq.SelectBuilder) sq.Select
 		now := time.Now().Unix() // There does not seam to be a portable way to get the current unix timestamp accross different DBs.
 		query = query.Where("(job.job_state != 'running' OR (? - job.start_time) > ?)", now, *filter.MinRunningFor)
 	}
+	if filter.Exclusive != nil {
+		query = query.Where("job.exclusive = ?", *filter.Exclusive)
+	}
 	if filter.State != nil {
 		states := make([]string, len(filter.State))
 		for i, val := range filter.State {

internal/taskManager/updateFootprintService.go

@@ -94,7 +94,7 @@ func RegisterFootprintWorker() {
 								}
 							}
 
-							// Add values rounded to 2 digits
+							// Add values rounded to 2 digits: repo.LoadStats may return unrounded
 							jobMeta.Statistics[metric] = schema.JobStatistics{
 								Unit: schema.Unit{
 									Prefix: archive.GetMetricConfig(job.Cluster, metric).Unit.Prefix,

pkg/schema/cluster.go

@@ -122,6 +122,38 @@ func (topo *Topology) GetSocketsFromHWThreads(
 	return sockets, exclusive
 }
 
+// Return a list of socket IDs given a list of core IDs.  Even if just one
+// core is in that socket, add it to the list.  If no cores other than
+// those in the argument list are assigned to one of the sockets in the first
+// return value, return true as the second value.  TODO: Optimize this, there
+// must be a more efficient way/algorithm.
+func (topo *Topology) GetSocketsFromCores (
+	cores []int,
+) (sockets []int, exclusive bool) {
+	socketsMap := map[int]int{}
+	for _, core := range cores {
+		for _, hwthreadInCore := range topo.Core[core] {
+			for socket, hwthreadsInSocket := range topo.Socket {
+				for _, hwthreadInSocket := range hwthreadsInSocket {
+					if hwthreadInCore == hwthreadInSocket {
+						socketsMap[socket] += 1
+					}
+				}
+			}
+		}
+	}
+
+	exclusive = true
+	hwthreadsPerSocket := len(topo.Node) / len(topo.Socket)
+	sockets = make([]int, 0, len(socketsMap))
+	for socket, count := range socketsMap {
+		sockets = append(sockets, socket)
+		exclusive = exclusive && count == hwthreadsPerSocket
+	}
+
+	return sockets, exclusive
+}
+
 // Return a list of core IDs given a list of hwthread IDs.  Even if just one
 // hwthread is in that core, add it to the list.  If no hwthreads other than
 // those in the argument list are assigned to one of the cores in the first

pkg/schema/metrics.go

@@ -291,6 +291,21 @@ func (jd *JobData) AddNodeScope(metric string) bool {
 	return true
 }
 
+func (jd *JobData) RoundMetricStats() {
+	// TODO: Make Digit-Precision Configurable? (Currently: Fixed to 2 Digits)
+	for _, scopes := range *jd {
+		for _, jm := range scopes {
+			for index := range jm.Series {
+				jm.Series[index].Statistics = MetricStatistics{
+					Avg: (math.Round(jm.Series[index].Statistics.Avg*100) / 100),
+					Min: (math.Round(jm.Series[index].Statistics.Min*100) / 100),
+					Max: (math.Round(jm.Series[index].Statistics.Max*100) / 100),
+				}
+			}
+		}
+	}
+}
+
 func (jm *JobMetric) AddPercentiles(ps []int) bool {
 	if jm.StatisticsSeries == nil {
 		jm.AddStatisticsSeries()

pkg/schema/schemas/config.schema.json

@@ -446,7 +446,7 @@
           }
         },
         "job_view_selectedMetrics": {
-          "description": "",
+          "description": "Initial metrics shown as plots in single job view",
           "type": "array",
           "items": {
             "type": "string",

web/frontend/src/Job.root.svelte

@@ -117,27 +117,41 @@
     }
   `;
 
+const roofQuery = gql`
+    query ($dbid: ID!, $selectedMetrics: [String!]!, $selectedScopes: [MetricScope!]!, $selectedResolution: Int) {
+      jobMetrics(id: $dbid, metrics: $selectedMetrics, scopes: $selectedScopes, resolution: $selectedResolution) {
+        name
+        scope
+        metric {
+          series {
+            data
+          }
+        }
+      }
+    }
+  `;
+
   $: jobMetrics = queryStore({
     client: client,
     query: query,
     variables: { dbid, selectedMetrics, selectedScopes },
   });
 
+  // Roofline: Always load roofMetrics with configured timestep (Resolution: 0)
+  $: roofMetrics = queryStore({
+    client: client,
+    query: roofQuery,
+    variables: { dbid, selectedMetrics: ["flops_any", "mem_bw"], selectedScopes: ["node"], selectedResolution: 0 },
+  });
+
   // Handle Job Query on Init -> is not executed anymore
   getContext("on-init")(() => {
     let job = $initq.data.job;
     if (!job) return;
 
     const pendingMetrics = [
-      "flops_any",
-      "mem_bw",
       ...(ccconfig[`job_view_selectedMetrics:${job.cluster}`] ||
-        $initq.data.globalMetrics.reduce((names, gm) => {
+        ccconfig[`job_view_selectedMetrics`]
-          if (gm.availability.find((av) => av.cluster === job.cluster)) {
-            names.push(gm.name);
-          }
-          return names;
-        }, [])
       ),
       ...(ccconfig[`job_view_nodestats_selectedMetrics:${job.cluster}`] ||
         ccconfig[`job_view_nodestats_selectedMetrics`]
@@ -276,12 +290,12 @@
 
   <!-- Column 3: Job Roofline; If footprint Enabled: full width, else half width -->
   <Col xs={12} md={12} xl={5} xxl={6}>
-    {#if $initq.error || $jobMetrics.error}
+    {#if $initq.error || $roofMetrics.error}
       <Card body color="danger">
         <p>Initq Error: {$initq.error?.message}</p>
-        <p>jobMetrics Error: {$jobMetrics.error?.message}</p>
+        <p>roofMetrics (jobMetrics) Error: {$roofMetrics.error?.message}</p>
       </Card>
-    {:else if $initq?.data && $jobMetrics?.data}
+    {:else if $initq?.data && $roofMetrics?.data}
       <Card style="height: 400px;">
         <div bind:clientWidth={roofWidth}>
           <Roofline
@@ -292,10 +306,10 @@
               .find((c) => c.name == $initq.data.job.cluster)
               .subClusters.find((sc) => sc.name == $initq.data.job.subCluster)}
             data={transformDataForRoofline(
-              $jobMetrics.data?.jobMetrics?.find(
+              $roofMetrics.data?.jobMetrics?.find(
                 (m) => m.name == "flops_any" && m.scope == "node",
               )?.metric,
-              $jobMetrics.data?.jobMetrics?.find(
+              $roofMetrics.data?.jobMetrics?.find(
                 (m) => m.name == "mem_bw" && m.scope == "node",
               )?.metric,
             )}

web/frontend/src/Status.root.svelte

@@ -80,6 +80,7 @@
     : ccconfig.user_view_histogramMetrics || [];
 
   const client = getContextClient();
+  // Note: nodeMetrics are requested on configured $timestep resolution
   $: mainQuery = queryStore({
     client: client,
     query: gql`

web/frontend/src/Systems.root.svelte

@@ -77,6 +77,7 @@
     for (let sm of systemMetrics) {
       systemUnits[sm.name] = (sm?.unit?.prefix ? sm.unit.prefix : "") + (sm?.unit?.base ? sm.unit.base : "")
     }
+    if (!selectedMetric) selectedMetric = systemMetrics[0].name
   }
 
   $: loadMetrics($initialized)

web/frontend/src/generic/plots/Polar.svelte

@@ -2,16 +2,12 @@
     @component Polar Plot based on chartJS Radar
 
     Properties:
-    - `footprintData [Object]?`: job.footprint content, evaluated in regards to peak config in jobSummary.svelte [Default: null]
+    - `polarMetrics [Object]?`: Metric names and scaled peak values for rendering polar plot [Default: [] ]
-    - `metrics [String]?`: Metric names to display as polar plot [Default: null]
-    - `cluster GraphQL.Cluster?`: Cluster Object of the parent job [Default: null]
-    - `subCluster GraphQL.SubCluster?`: SubCluster Object of the parent job [Default: null]
     - `jobMetrics [GraphQL.JobMetricWithName]?`: Metric data [Default: null]
     - `height Number?`: Plot height [Default: 365]
  -->
 
 <script>
-    import { getContext } from 'svelte'
     import { Radar } from 'svelte-chartjs';
     import {
         Chart as ChartJS,
@@ -34,54 +30,37 @@
         LineElement
     );
 
-    export let footprintData = null;
+    export let polarMetrics = [];
-    export let metrics = null;
-    export let cluster = null;
-    export let subCluster = null;
     export let jobMetrics = null;
     export let height = 350;
 
-    function getLabels() {
+    const labels = polarMetrics
-        if (footprintData) {
+        .filter((m) => (m.peak != null))
-            return footprintData.filter(fpd => {
+        .map(pm => pm.name)
-                if (!jobMetrics.find(m => m.name == fpd.name && m.scope == "node" || fpd.impact == 4)) {
+        .sort(function (a, b) {return ((a > b) ? 1 : ((b > a) ? -1 : 0))});
-                    console.warn(`PolarPlot: No metric data for '${fpd.name}'`)
+
-                    return false
+    function loadData(type) {
-                }
+        if (!labels) {
-                return true
+            console.warn("Empty 'polarMetrics' array prop! Cannot render Polar representation.")
-            })
+            return []
-            .map(filtered => filtered.name)
-            .sort(function (a, b) {
-                return ((a > b) ? 1 : ((b > a) ? -1 : 0));
-            });
         } else {
-            return metrics.filter(name => {
+            if (type === 'avg') {
-                if (!jobMetrics.find(m => m.name == name && m.scope == "node")) {
+                return getValues(getAvg)
-                    console.warn(`PolarPlot: No metric data for '${name}'`)
+            } else if (type === 'max') {
-                    return false
+                return getValues(getMax)
-                }
+            } else if (type === 'min') {
-                return true
+                return getValues(getMin)
-            })
+            }
-            .sort(function (a, b) {
+            console.log('Unknown Type For Polar Data (must be one of [min, max, avg])')
-                return ((a > b) ? 1 : ((b > a) ? -1 : 0));
+            return []
-            });
         }
     }
 
-    const labels = getLabels();
+    // Helpers
-    const getMetricConfig = getContext("getMetricConfig");
 
-    const getValuesForStatGeneric = (getStat) => labels.map(name => {
+    const getValues = (getStat) => labels.map(name => {
-        // TODO: Requires Scaling if Shared Job
+        // Peak is adapted and scaled for job shared state
-        const peak = getMetricConfig(cluster, subCluster, name).peak
+        const peak = polarMetrics.find(m => m.name == name).peak
-        const metric = jobMetrics.find(m => m.name == name && m.scope == "node")
-        const value = getStat(metric.metric) / peak
-        return value <= 1. ? value : 1.
-    })
-
-    const getValuesForStatFootprint = (getStat) => labels.map(name => {
-        // FootprintData 'Peak' is pre-scaled for Shared Jobs in JobSummary Component
-        const peak = footprintData.find(fpd => fpd.name === name).peak
         const metric = jobMetrics.find(m => m.name == name && m.scope == "node")
         const value = getStat(metric.metric) / peak
         return value <= 1. ? value : 1.
@@ -108,36 +87,14 @@
         return avg / metric.series.length
     }
 
-    function loadDataGeneric(type) {
+    // Chart JS Objects
-        if (type === 'avg') {
-            return getValuesForStatGeneric(getAvg)
-        } else if (type === 'max') {
-            return getValuesForStatGeneric(getMax)
-        } else if (type === 'min') {
-            return getValuesForStatGeneric(getMin)
-        }
-        console.log('Unknown Type For Polar Data')
-        return []
-    }
-
-    function loadDataForFootprint(type) {
-        if (type === 'avg') {
-            return getValuesForStatFootprint(getAvg)
-        } else if (type === 'max') {
-            return getValuesForStatFootprint(getMax)
-        } else if (type === 'min') {
-            return getValuesForStatFootprint(getMin)
-        }
-        console.log('Unknown Type For Polar Data')
-        return []
-    }
 
     const data = {
         labels: labels,
         datasets: [
             {
                 label: 'Max',
-                data: footprintData ? loadDataForFootprint('max') : loadDataGeneric('max'), // Node Scope Only
+                data: loadData('max'), // Node Scope Only
                 fill: 1,
                 backgroundColor: 'rgba(0, 0, 255, 0.25)',
                 borderColor: 'rgb(0, 0, 255)',
@@ -148,7 +105,7 @@
             },
             {
                 label: 'Avg',
-                data: footprintData ? loadDataForFootprint('avg') : loadDataGeneric('avg'), // Node Scope Only
+                data: loadData('avg'), // Node Scope Only
                 fill: 2,
                 backgroundColor: 'rgba(255, 210, 0, 0.25)',
                 borderColor: 'rgb(255, 210, 0)',
@@ -159,7 +116,7 @@
             },
             {
                 label: 'Min',
-                data: footprintData ? loadDataForFootprint('min') : loadDataGeneric('min'), // Node Scope Only
+                data: loadData('min'), // Node Scope Only
                 fill: true,
                 backgroundColor: 'rgba(255, 0, 0, 0.25)',
                 borderColor: 'rgb(255, 0, 0)',

web/frontend/src/job/JobSummary.svelte

@@ -30,9 +30,25 @@
   export let height = "400px";
 
   const ccconfig = getContext("cc-config")
-  const showFootprint = !!ccconfig[`job_view_showFootprint`];
+  const globalMetrics = getContext("globalMetrics")
+  const showFootprintTab = !!ccconfig[`job_view_showFootprint`];
 
-  const footprintData = job?.footprint?.map((jf) => {
+  // Metrics Configured To Be Footprints For (sub)Cluster
+  const clusterFootprintMetrics = getContext("clusters")
+    .find((c) => c.name == job.cluster)?.subClusters
+    .find((sc) => sc.name == job.subCluster)?.footprint || []
+
+  // Data For Polarplot Will Be Calculated Based On JobMetrics And Thresholds
+  const polarMetrics = globalMetrics.reduce((pms, gm) => {
+    if (clusterFootprintMetrics.includes(gm.name)) {
+      const fmt = findJobFootprintThresholds(job, gm.footprint, getContext("getMetricConfig")(job.cluster, job.subCluster, gm.name));
+      pms.push({ name: gm.name, peak: fmt ? fmt.peak : null });
+    }
+    return pms;
+  }, [])
+
+  // Prepare Job Footprint Data Based On Values Saved In Database
+  const jobFootprintData = !showFootprintTab ? null : job?.footprint?.map((jf) => {
     const fmc = getContext("getMetricConfig")(job.cluster, job.subCluster, jf.name);
     if (fmc) {
       // Unit
@@ -187,16 +203,16 @@
       return res;
     };
 
-    $: summaryMessages = writeSummary(footprintData) 
+    $: summaryMessages = writeSummary(jobFootprintData) 
   */
 </script>
 
 <Card class="overflow-auto" style="width: {width}; height: {height}">
   <TabContent> <!-- on:tab={(e) => (status = e.detail)} -->
-    {#if showFootprint}
+    {#if showFootprintTab}
       <TabPane tabId="foot" tab="Footprint" active>
         <CardBody>
-          {#each footprintData as fpd, index}
+          {#each jobFootprintData as fpd, index}
             {#if fpd.impact !== 4}
               <div class="mb-1 d-flex justify-content-between">
                 <div>&nbsp;<b>{fpd.name} ({fpd.stat})</b></div>
@@ -237,7 +253,7 @@
                 >{fpd.message}</Tooltip
                 >
               </div>
-              <Row cols={12} class="{(footprintData.length == (index + 1)) ? 'mb-0' : 'mb-2'}">
+              <Row cols={12} class="{(jobFootprintData.length == (index + 1)) ? 'mb-0' : 'mb-2'}">
                 {#if fpd.dir}
                   <Col xs="1">
                     <Icon name="caret-left-fill" />
@@ -279,10 +295,10 @@
         </CardBody>
       </TabPane>
     {/if}
-    <TabPane tabId="polar" tab="Polar" active={!showFootprint}>
+    <TabPane tabId="polar" tab="Polar" active={!showFootprintTab}>
       <CardBody>
         <Polar
-          {footprintData}
+          {polarMetrics}
           {jobMetrics}
         />
       </CardBody>

web/frontend/src/job/Metric.svelte

@@ -148,17 +148,18 @@
           zoomState = {...pendingZoomState}
         }
 
-        // Set selected scope to min of returned scopes
+        // On additional scope request
         if (selectedScope == "load-all") {
+          // Push scope to statsTable (Needs to be in this case, else newly selected 'Metric.svelte' renders cause statsTable race condition)
+          const statsTableData = $metricData.data.singleUpdate.filter((x) => x.scope !== "node")
+          if (statsTableData.length > 0) {
+            dispatch("more-loaded", statsTableData);
+          }
+          // Set selected scope to min of returned scopes
           selectedScope = minScope(scopes)
           nodeOnly = (selectedScope == "node") // "node" still only scope after load-all
         }
 
-        const statsTableData = $metricData.data.singleUpdate.filter((x) => x.scope !== "node")
-        if (statsTableData.length > 0) {
-          dispatch("more-loaded", statsTableData);
-        }
-
         patternMatches = statsPattern.exec(selectedScope)
 
         if (!patternMatches) {