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

Adapt test input to new unit schema

Browse Source
This commit is contained in:
Jan Eitzinger 2022-11-09 19:47:56 +01:00
parent d2818d54ff
commit 740d2a2928
9 changed files with 836953 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/schema/validate_test.go
View File

@ -68,7 +68,7 @@ func TestValidateCluster(t *testing.T) {
{
"name": "cpu_load",
"scope": "hwthread",
"unit": "load",
"unit": {"base": "load"},
"timestep": 60
}
]

417836
test/archive/emmy/1403/244/1608923076/data.json
View File

File diff suppressed because one or more lines are too long

194
test/archive/emmy/1403/244/1608923076/meta.json
View File

@ -1 +1,193 @@
{"exclusive":1,"jobId":1403244,"statistics":{"mem_bw":{"avg":63.57,"min":0,"unit":"GB/s","max":74.5},"rapl_power":{"avg":228.07,"min":0,"unit":"W","max":258.56},"ipc":{"unit":"IPC","max":0.510204081632653,"avg":1.53846153846154,"min":0.0},"clock":{"min":1380.32,"avg":2599.39,"unit":"MHz","max":2634.46},"cpu_load":{"avg":18.4,"min":0,"max":23.58,"unit":"load"},"flops_any":{"max":404.62,"unit":"GF/s","avg":225.59,"min":0},"flops_dp":{"max":0.24,"unit":"GF/s","min":0,"avg":0},"mem_used":{"min":1.55,"avg":27.84,"unit":"GB","max":37.5},"flops_sp":{"min":0,"avg":225.59,"max":404.62,"unit":"GF/s"}},"resources":[{"hostname":"e0102"},{"hostname":"e0103"},{"hostname":"e0105"},{"hostname":"e0106"},{"hostname":"e0107"},{"hostname":"e0108"},{"hostname":"e0114"},{"hostname":"e0320"},{"hostname":"e0321"},{"hostname":"e0325"},{"hostname":"e0404"},{"hostname":"e0415"},{"hostname":"e0433"},{"hostname":"e0437"},{"hostname":"e0439"},{"hostname":"e0501"},{"hostname":"e0503"},{"hostname":"e0505"},{"hostname":"e0506"},{"hostname":"e0512"},{"hostname":"e0513"},{"hostname":"e0514"},{"hostname":"e0653"},{"hostname":"e0701"},{"hostname":"e0716"},{"hostname":"e0727"},{"hostname":"e0728"},{"hostname":"e0925"},{"hostname":"e0926"},{"hostname":"e0929"},{"hostname":"e0934"},{"hostname":"e0951"}],"walltime":10,"jobState":"completed","cluster":"emmy","stopTime":1609009562,"user":"emmyUser6","startTime":1608923076,"partition":"work","tags":[],"project":"no project","numNodes":32,"duration":86486}
{
"exclusive": 1,
"jobId": 1403244,
"statistics": {
"mem_bw": {
"avg": 63.57,
"min": 0,
"unit": {
"base": "B/s",
"prefix": "G"
},
"max": 74.5
},
"rapl_power": {
"avg": 228.07,
"min": 0,
"unit": {
"base": "W"
},
"max": 258.56
},
"ipc": {
"unit": {
"base": "IPC"
},
"max": 0.510204081632653,
"avg": 1.53846153846154,
"min": 0.0
},
"clock": {
"min": 1380.32,
"avg": 2599.39,
"unit": {
"base": "Hz",
"prefix": "M"
},
"max": 2634.46
},
"cpu_load": {
"avg": 18.4,
"min": 0,
"max": 23.58,
"unit": {
"base": "load"
}
},
"flops_any": {
"max": 404.62,
"unit": {
"base": "F/s",
"prefix": "G"
},
"avg": 225.59,
"min": 0
},
"flops_dp": {
"max": 0.24,
"unit": {
"base": "F/s",
"prefix": "G"
},
"min": 0,
"avg": 0
},
"mem_used": {
"min": 1.55,
"avg": 27.84,
"unit": {
"base": "B",
"prefix": "G"
},
"max": 37.5
},
"flops_sp": {
"min": 0,
"avg": 225.59,
"max": 404.62,
"unit": {
"base": "F/s",
"prefix": "G"
}
}
},
"resources": [
{
"hostname": "e0102"
},
{
"hostname": "e0103"
},
{
"hostname": "e0105"
},
{
"hostname": "e0106"
},
{
"hostname": "e0107"
},
{
"hostname": "e0108"
},
{
"hostname": "e0114"
},
{
"hostname": "e0320"
},
{
"hostname": "e0321"
},
{
"hostname": "e0325"
},
{
"hostname": "e0404"
},
{
"hostname": "e0415"
},
{
"hostname": "e0433"
},
{
"hostname": "e0437"
},
{
"hostname": "e0439"
},
{
"hostname": "e0501"
},
{
"hostname": "e0503"
},
{
"hostname": "e0505"
},
{
"hostname": "e0506"
},
{
"hostname": "e0512"
},
{
"hostname": "e0513"
},
{
"hostname": "e0514"
},
{
"hostname": "e0653"
},
{
"hostname": "e0701"
},
{
"hostname": "e0716"
},
{
"hostname": "e0727"
},
{
"hostname": "e0728"
},
{
"hostname": "e0925"
},
{
"hostname": "e0926"
},
{
"hostname": "e0929"
},
{
"hostname": "e0934"
},
{
"hostname": "e0951"
}
],
"walltime": 10,
"jobState": "completed",
"cluster": "emmy",
"stopTime": 1609009562,
"user": "emmyUser6",
"startTime": 1608923076,
"partition": "work",
"tags": [],
"project": "no project",
"numNodes": 32,
"duration": 86486
}

418124
test/archive/emmy/1404/397/1609300556/data.json
View File

File diff suppressed because one or more lines are too long

194
test/archive/emmy/1404/397/1609300556/meta.json
View File

@ -1 +1,193 @@
{"stopTime":1609387081,"resources":[{"hostname":"e0151"},{"hostname":"e0152"},{"hostname":"e0153"},{"hostname":"e0232"},{"hostname":"e0303"},{"hostname":"e0314"},{"hostname":"e0344"},{"hostname":"e0345"},{"hostname":"e0348"},{"hostname":"e0507"},{"hostname":"e0518"},{"hostname":"e0520"},{"hostname":"e0522"},{"hostname":"e0526"},{"hostname":"e0527"},{"hostname":"e0528"},{"hostname":"e0530"},{"hostname":"e0551"},{"hostname":"e0604"},{"hostname":"e0613"},{"hostname":"e0634"},{"hostname":"e0639"},{"hostname":"e0640"},{"hostname":"e0651"},{"hostname":"e0653"},{"hostname":"e0701"},{"hostname":"e0704"},{"hostname":"e0751"},{"hostname":"e0809"},{"hostname":"e0814"},{"hostname":"e0819"},{"hostname":"e0908"}],"walltime":10,"cluster":"emmy","jobState":"completed","statistics":{"clock":{"max":2634.9,"unit":"MHz","min":0,"avg":2597.8},"cpu_load":{"max":27.41,"unit":"load","min":0,"avg":18.39},"mem_bw":{"min":0,"avg":63.23,"unit":"GB/s","max":75.06},"ipc":{"min":0.0,"avg":1.53846153846154,"unit":"IPC","max":0.490196078431373},"rapl_power":{"min":0,"avg":227.32,"unit":"W","max":256.22},"mem_used":{"min":1.5,"avg":27.77,"unit":"GB","max":37.43},"flops_sp":{"unit":"GF/s","max":413.21,"min":0,"avg":224.41},"flops_dp":{"max":5.72,"unit":"GF/s","min":0,"avg":0},"flops_any":{"min":0,"avg":224.42,"max":413.21,"unit":"GF/s"}},"exclusive":1,"jobId":1404397,"tags":[],"partition":"work","project":"no project","user":"emmyUser6","startTime":1609300556,"duration":86525,"numNodes":32}
{
"stopTime": 1609387081,
"resources": [
{
"hostname": "e0151"
},
{
"hostname": "e0152"
},
{
"hostname": "e0153"
},
{
"hostname": "e0232"
},
{
"hostname": "e0303"
},
{
"hostname": "e0314"
},
{
"hostname": "e0344"
},
{
"hostname": "e0345"
},
{
"hostname": "e0348"
},
{
"hostname": "e0507"
},
{
"hostname": "e0518"
},
{
"hostname": "e0520"
},
{
"hostname": "e0522"
},
{
"hostname": "e0526"
},
{
"hostname": "e0527"
},
{
"hostname": "e0528"
},
{
"hostname": "e0530"
},
{
"hostname": "e0551"
},
{
"hostname": "e0604"
},
{
"hostname": "e0613"
},
{
"hostname": "e0634"
},
{
"hostname": "e0639"
},
{
"hostname": "e0640"
},
{
"hostname": "e0651"
},
{
"hostname": "e0653"
},
{
"hostname": "e0701"
},
{
"hostname": "e0704"
},
{
"hostname": "e0751"
},
{
"hostname": "e0809"
},
{
"hostname": "e0814"
},
{
"hostname": "e0819"
},
{
"hostname": "e0908"
}
],
"walltime": 10,
"cluster": "emmy",
"jobState": "completed",
"statistics": {
"clock": {
"max": 2634.9,
"unit": {
"base": "Hz",
"prefix": "M"
},
"min": 0,
"avg": 2597.8
},
"cpu_load": {
"max": 27.41,
"min": 0,
"avg": 18.39,
"unit": {
"base": "load"
}
},
"mem_bw": {
"min": 0,
"avg": 63.23,
"unit": {
"base": "B/s",
"prefix": "G"
},
"max": 75.06
},
"ipc": {
"min": 0.0,
"avg": 1.53846153846154,
"unit": {
"base": "IPC"
},
"max": 0.490196078431373
},
"rapl_power": {
"min": 0,
"avg": 227.32,
"unit": {
"base": "W"
},
"max": 256.22
},
"mem_used": {
"min": 1.5,
"avg": 27.77,
"unit": {
"base": "B",
"prefix": "G"
},
"max": 37.43
},
"flops_sp": {
"unit": {
"base": "F/s",
"prefix": "G"
},
"max": 413.21,
"min": 0,
"avg": 224.41
},
"flops_dp": {
"max": 5.72,
"unit": {
"base": "F/s",
"prefix": "G"
},
"min": 0,
"avg": 0
},
"flops_any": {
"min": 0,
"avg": 224.42,
"max": 413.21,
"unit": {
"base": "F/s",
"prefix": "G"
}
}
},
"exclusive": 1,
"jobId": 1404397,
"tags": [],
"partition": "work",
"project": "no project",
"user": "emmyUser6",
"startTime": 1609300556,
"duration": 86525,
"numNodes": 32
}

52
test/archive/emmy/cluster.json
View File

@ -30,7 +30,9 @@
{
"name": "cpu_load",
"scope": "hwthread",
"unit": "load",
"unit": {
"base": "load"
},
"timestep": 60,
"peak": 40,
"normal": 20,
@ -40,7 +42,10 @@
{
"name": "mem_used",
"scope": "node",
"unit": "GB",
"unit": {
"base": "B",
"prefix": "G"
},
"timestep": 60,
"peak": 64,
"normal": 20,
@ -50,7 +55,10 @@
{
"name": "flops_any",
"scope": "hwthread",
"unit": "GF/s",
"unit": {
"base": "F/s",
"prefix": "G"
},
"timestep": 60,
"peak": 704,
"normal": 100,
@ -60,7 +68,10 @@
{
"name": "flops_sp",
"scope": "hwthread",
"unit": "GF/s",
"unit": {
"base": "F/s",
"prefix": "G"
},
"timestep": 60,
"peak": 704,
"normal": 100,
@ -70,7 +81,10 @@
{
"name": "flops_dp",
"scope": "hwthread",
"unit": "GF/s",
"unit": {
"base": "F/s",
"prefix": "G"
},
"timestep": 60,
"peak": 350,
"normal": 50,
@ -80,7 +94,10 @@
{
"name": "mem_bw",
"scope": "memoryDomain",
"unit": "GB/s",
"unit": {
"base": "B/s",
"prefix": "G"
},
"timestep": 60,
"peak": 80,
"normal": 30,
@ -90,7 +107,9 @@
{
"name": "ipc",
"scope": "hwthread",
"unit": "IPC",
"unit": {
"base": "IPC"
},
"timestep": 60,
"peak": 80,
"normal": 30,
@ -100,7 +119,10 @@
{
"name": "clock",
"scope": "hwthread",
"unit": "MHz",
"unit": {
"base": "Hz",
"prefix": "M"
},
"timestep": 60,
"peak": 80,
"normal": 30,
@ -110,7 +132,9 @@
{
"name": "rapl_power",
"scope": "socket",
"unit": "W",
"unit": {
"base": "W"
},
"timestep": 60,
"peak": 80,
"normal": 30,
@ -120,7 +144,10 @@
{
"name": "ib_bw",
"scope": "node",
"unit": "GB/s",
"unit": {
"base": "B/s",
"prefix": "G"
},
"timestep": 60,
"peak": 40,
"normal": 20,
@ -130,7 +157,10 @@
{
"name": "lustre_bw",
"scope": "node",
"unit": "GB/s",
"unit": {
"base": "B/s",
"prefix": "G"
},
"timestep": 60,
"peak": 40,
"normal": 20,

34
test/data.json
View File

@ -1,7 +1,9 @@
{
"cpu_used": {
"core": {
"unit": "cpu used",
"unit": {
"base": ""
},
"scope": "core",
"timestep": 30,
"series": [
@ -99,7 +101,9 @@
},
"ipc": {
"core": {
"unit": "IPC",
"unit": {
"base": "IPC"
},
"scope": "core",
"timestep": 60,
"series": [
@ -173,7 +177,9 @@
},
"flops_any": {
"core": {
"unit": "F/s",
"unit": {
"base": "F/s"
},
"scope": "core",
"timestep": 60,
"series": [
@ -247,7 +253,9 @@
},
"mem_bw": {
"socket": {
"unit": "B/s",
"unit": {
"base": "B/s"
},
"scope": "socket",
"timestep": 60,
"series": [
@ -289,7 +297,9 @@
},
"file_bw": {
"node": {
"unit": "B/s",
"unit": {
"base": "B/s"
},
"scope": "node",
"timestep": 30,
"series": [
@ -341,7 +351,9 @@
},
"net_bw": {
"node": {
"unit": "B/s",
"unit": {
"base": "B/s"
},
"scope": "node",
"timestep": 30,
"series": [
@ -393,7 +405,9 @@
},
"mem_used": {
"node": {
"unit": "B",
"unit": {
"base": "B"
},
"scope": "node",
"timestep": 30,
"series": [
@ -445,7 +459,9 @@
},
"cpu_power": {
"socket": {
"unit": "W",
"unit": {
"base": "W"
},
"scope": "socket",
"timestep": 60,
"series": [
@ -485,4 +501,4 @@
"statisticsSeries": null
}
}
}
}

24
test/integration_test.go
View File

@ -84,7 +84,7 @@ func setup(t *testing.T) *api.RestApi {
"metricConfig": [
{
"name": "load_one",
"unit": "load",
"unit": { "base": "load"},
"scope": "node",
"timestep": 60,
"peak": 8,
@ -125,7 +125,7 @@ func setup(t *testing.T) *api.RestApi {
{
"name": "cpu_used",
"scope": "core",
"unit": "",
"unit": {"base": ""},
"timestep": 30,
"subClusters": [
{
@ -140,7 +140,7 @@ func setup(t *testing.T) *api.RestApi {
{
"name": "ipc",
"scope": "core",
"unit": "IPC",
"unit": { "base": "IPC"},
"timestep": 60,
"subClusters": [
{
@ -155,7 +155,7 @@ func setup(t *testing.T) *api.RestApi {
{
"name": "flops_any",
"scope": "core",
"unit": "F/s",
"unit": { "base": "F/s"},
"timestep": 60,
"subClusters": [
{
@ -170,7 +170,7 @@ func setup(t *testing.T) *api.RestApi {
{
"name": "mem_bw",
"scope": "socket",
"unit": "B/s",
"unit": { "base": "B/s"},
"timestep": 60,
"subClusters": [
{
@ -185,7 +185,7 @@ func setup(t *testing.T) *api.RestApi {
{
"name": "file_bw",
"scope": "node",
"unit": "B/s",
"unit": { "base": "B/s"},
"timestep": 30,
"subClusters": [
{
@ -200,7 +200,7 @@ func setup(t *testing.T) *api.RestApi {
{
"name": "net_bw",
"scope": "node",
"unit": "B/s",
"unit": { "base": "B/s"},
"timestep": 30,
"subClusters": [
{
@ -215,7 +215,7 @@ func setup(t *testing.T) *api.RestApi {
{
"name": "mem_used",
"scope": "node",
"unit": "B",
"unit": {"base": "B"},
"timestep": 30,
"subClusters": [
{
@ -230,7 +230,7 @@ func setup(t *testing.T) *api.RestApi {
{
"name": "cpu_power",
"scope": "socket",
"unit": "W",
"unit": {"base": "W"},
"timestep": 60,
"subClusters": [
{
@ -321,7 +321,7 @@ func TestRestApi(t *testing.T) {
testData := schema.JobData{
"load_one": map[schema.MetricScope]*schema.JobMetric{
schema.MetricScopeNode: {
Unit: "load",
Unit: schema.Unit{Base: "load"},
Scope: schema.MetricScopeNode,
Timestep: 60,
Series: []schema.Series{
@ -604,13 +604,13 @@ func testImportFlag(t *testing.T) {
}
r := map[string]string{"mem_used": "GB", "net_bw": "KB/s",
"cpu_power": "W", "cpu_used": "cpu_used",
"cpu_power": "W", "cpu_used": "",
"file_bw": "KB/s", "flops_any": "Flops/s",
"mem_bw": "GB/s", "ipc": "IPC"}
for name, scopes := range data {
for _, metric := range scopes {
if metric.Unit != r[name] {
if metric.Unit.Base != r[name] {
t.Errorf("Metric %s unit: Got %s, want %s", name, metric.Unit, r[name])
}
}

19
test/meta.json
View File

@ -8,7 +8,6 @@
"arrayJobId": 0,
"numNodes": 2,
"numHwthreads": 4,
"numAcc": 0,
"exclusive": 0,
"startTime": 1635856524,
"jobState": "completed",
@ -30,49 +29,49 @@
"min": 0.03694102397926118,
"avg": 0.48812580468611544,
"max": 1.0000000000000002,
"unit": "cpu used"
"unit": { "base": ""}
},
"ipc": {
"min": 0.30469640475234366,
"avg": 1.154312070173657,
"max": 1.797623522191001,
"unit": "IPC"
"unit": { "base": "IPC" }
},
"flops_any": {
"min": 0.0,
"avg": 686.5190320308598,
"max": 4346.591400350933,
"unit": "F/s"
"unit": { "base": "F/s" }
},
"mem_bw": {
"min": 653671812.1661415,
"avg": 1605031604.9852366,
"max": 2614718291.9554267,
"unit": "B/s"
"unit": { "base": "B/s" }
},
"file_bw": {
"min": 0.0,
"avg": 620592.5419124186,
"max": 11559156.360352296,
"unit": "B/s"
"unit": { "base": "B/s" }
},
"net_bw": {
"min": 126779.89655880642,
"avg": 763101.082138246,
"max": 1916309.7075416835,
"unit": "B/s"
"unit": { "base": "B/s" }
},
"mem_used": {
"min": 2779066368.0,
"avg": 9647598685.09091,
"max": 10202595328.0,
"unit": "B"
"unit": { "base": "B" }
},
"cpu_power": {
"min": 35.50647456742635,
"avg": 78.63442946337237,
"max": 85.83909286117324,
"unit": "W"
}
"unit": { "base": "W" }
}
}
}