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

increase server timeout limit, improve and add db indices

Browse Source 
- change energy footprint key to string
This commit is contained in:
Christoph Kluge 2024-08-27 17:43:48 +02:00
parent 084f89fa32
commit cff60eb51c
5 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cc-backend/server.go
View File

@ -260,8 +260,8 @@ func serverStart() {
}) })
server = &http.Server{ server = &http.Server{
ReadTimeout: 10 * time.Second, ReadTimeout: 20 * time.Second,
WriteTimeout: 10 * time.Second, WriteTimeout: 20 * time.Second,
Handler: handler, Handler: handler,
Addr: config.Keys.Addr, Addr: config.Keys.Addr,
} }

8
internal/repository/migrations/sqlite3/08_add-footprint.up.sql
View File

@ -1,5 +1,7 @@
CREATE INDEX IF NOT EXISTS job_by_project ON job (project); CREATE INDEX IF NOT EXISTS jobs_cluster_orderby_starttime ON job (cluster, start_time DESC);
CREATE INDEX IF NOT EXISTS job_list_projects ON job (project, job_state); CREATE INDEX IF NOT EXISTS jobs_cluster_count ON job (cluster, job_state, start_time);
CREATE INDEX IF NOT EXISTS jobs_project_orderby_starttime ON job (project, start_time DESC);
CREATE INDEX IF NOT EXISTS jobs_project_count ON job (project, job_state, start_time);
ALTER TABLE job ADD COLUMN energy REAL NOT NULL DEFAULT 0.0; ALTER TABLE job ADD COLUMN energy REAL NOT NULL DEFAULT 0.0;
ALTER TABLE job ADD COLUMN energy_footprint TEXT DEFAULT NULL; ALTER TABLE job ADD COLUMN energy_footprint TEXT DEFAULT NULL;
@ -24,3 +26,5 @@ ALTER TABLE job DROP net_bw_avg;
ALTER TABLE job DROP net_data_vol_total; ALTER TABLE job DROP net_data_vol_total;
ALTER TABLE job DROP file_bw_avg; ALTER TABLE job DROP file_bw_avg;
ALTER TABLE job DROP file_data_vol_total; ALTER TABLE job DROP file_data_vol_total;
PRAGMA optimize;

4
pkg/archive/clusterConfig.go
View File

@ -88,7 +88,7 @@ func initClusterConfig() error {
sc.Footprint = append(sc.Footprint, newMetric.Name) sc.Footprint = append(sc.Footprint, newMetric.Name)
ml.Footprint = newMetric.Footprint ml.Footprint = newMetric.Footprint
} }
if newMetric.Energy { if newMetric.Energy != "" {
sc.EnergyFootprint = append(sc.EnergyFootprint, newMetric.Name) sc.EnergyFootprint = append(sc.EnergyFootprint, newMetric.Name)
} }
} }
@ -99,7 +99,7 @@ func initClusterConfig() error {
if newMetric.Footprint != "" { if newMetric.Footprint != "" {
sc.Footprint = append(sc.Footprint, newMetric.Name) sc.Footprint = append(sc.Footprint, newMetric.Name)
} }
if newMetric.Energy { if newMetric.Energy != "" {
sc.EnergyFootprint = append(sc.EnergyFootprint, newMetric.Name) sc.EnergyFootprint = append(sc.EnergyFootprint, newMetric.Name)
} }
} }

4
pkg/schema/cluster.go
View File

@ -54,7 +54,7 @@ type SubClusterConfig struct {
Alert float64 `json:"alert"` Alert float64 `json:"alert"`
Remove bool `json:"remove"` Remove bool `json:"remove"`
LowerIsBetter bool `json:"lowerIsBetter"` LowerIsBetter bool `json:"lowerIsBetter"`
Energy bool `json:"energy"` Energy string `json:"energy"`
} }
type MetricConfig struct { type MetricConfig struct {
@ -70,7 +70,7 @@ type MetricConfig struct {
Alert float64 `json:"alert"` Alert float64 `json:"alert"`
Timestep int `json:"timestep"` Timestep int `json:"timestep"`
LowerIsBetter bool `json:"lowerIsBetter"` LowerIsBetter bool `json:"lowerIsBetter"`
Energy bool `json:"energy"` Energy string `json:"energy"`
} }
type Cluster struct { type Cluster struct {

12
pkg/schema/schemas/cluster.schema.json
View File

@ -50,7 +50,11 @@
}, },
"energy": { "energy": {
"description": "Is it used to calculate job energy", "description": "Is it used to calculate job energy",
"type": "boolean" "type": "string",
"enum": [
"power",
"energy"
]
}, },
"lowerIsBetter": { "lowerIsBetter": {
"description": "Is lower better.", "description": "Is lower better.",
@ -93,7 +97,11 @@
}, },
"energy": { "energy": {
"description": "Is it used to calculate job energy. Overwrite global", "description": "Is it used to calculate job energy. Overwrite global",
"type": "boolean" "type": "string",
"enum": [
"power",
"energy"
]
}, },
"lowerIsBetter": { "lowerIsBetter": {
"description": "Is lower better. Overwrite global", "description": "Is lower better. Overwrite global",