From e29a4cabdf268b1d2cca1187e36788ee1eef6ddf Mon Sep 17 00:00:00 2001 From: Nicolas Perrin <nicolas.perrin@inria.fr> Date: Wed, 19 Mar 2025 14:52:04 +0100 Subject: [PATCH 1/4] [sophia][esterel3] add basic configuration generated by rake mass:create --- .../sophia/clusters/esterel3/esterel3.json | 66 +++++++++ .../clusters/esterel3/nodes/esterel3-1.json | 128 ++++++++++++++++++ .../sophia/clusters/esterel3/esterel3.yaml | 41 ++++++ .../clusters/esterel3/esterel3_metrics.yaml | 40 ++++++ .../sophia/clusters/esterel3/nodes.yaml.erb | 80 +++++++++++ 5 files changed, 355 insertions(+) create mode 100644 data/grid5000/sites/sophia/clusters/esterel3/esterel3.json create mode 100644 data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json create mode 100644 input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml create mode 100644 input/grid5000/sites/sophia/clusters/esterel3/esterel3_metrics.yaml create mode 100644 input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb diff --git a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json new file mode 100644 index 00000000000..0a76dd75fa2 --- /dev/null +++ b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json @@ -0,0 +1,66 @@ +{ + "boot_type": "uefi", + "created_at": "Thu, 01 Jan 1970 00:00:00 GMT", + "exotic": false, + "kavlan": false, + "manufactured_at": "1970-01-01", + "metrics": [ + { + "description": "Default subset of metrics from Prometheus Node Exporter", + "name": "prom_default_metrics", + "optional_period": 15000, + "period": 0, + "source": { + "id": [ + "node_boot_time_seconds", + "node_cpu_scaling_frequency_hertz", + "node_cpu_seconds_total", + "node_filesystem_free_bytes", + "node_filesystem_size_bytes", + "node_load1", + "node_load15", + "node_load5", + "node_memory_Buffers_bytes", + "node_memory_Cached_bytes", + "node_memory_MemAvailable_bytes", + "node_memory_MemFree_bytes", + "node_memory_MemTotal_bytes", + "node_memory_Shmem_bytes", + "node_memory_SwapFree_bytes", + "node_memory_SwapTotal_bytes", + "node_network_receive_bytes_total", + "node_network_receive_packets_total", + "node_network_transmit_bytes_total", + "node_network_transmit_packets_total", + "node_procs_blocked", + "node_procs_running", + "kwollect_custom" + ], + "port": 9100, + "protocol": "prometheus" + } + }, + { + "description": "All metrics from Prometheus Node Exporter", + "name": "prom_all_metrics", + "optional_period": 15000, + "period": 0, + "source": { + "port": 9100, + "protocol": "prometheus" + } + } + ], + "model": "Cluster Model", + "nodes_count": 1, + "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet", + "priority": 197001, + "queues": [ + "admin", + "testing" + ], + "redfish": true, + "type": "cluster", + "uid": "esterel3", + "warranty_end": "1970-01-01" +} \ No newline at end of file diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json new file mode 100644 index 00000000000..1d67776cc7b --- /dev/null +++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json @@ -0,0 +1,128 @@ +{ + "architecture": { + "cpu_core_numbering": "contiguous", + "nb_cores": 72, + "nb_procs": 1, + "nb_threads": 72, + "platform_type": "x86_64" + }, + "bios": { + "release_date": "01/01/2000", + "vendor": "Unknown", + "version": 1 + }, + "bmc_version": "v1", + "chassis": { + "manufactured_at": "1970-01-01", + "manufacturer": "Unknown", + "name": "Unknown", + "warranty_end": "1970-01-01" + }, + "exotic": false, + "main_memory": { + "ram_size": 8 + }, + "management_tools": { + "bmc_vendor_tool": "ipmitool", + "ipmitool": { + "retries": 5 + } + }, + "memory_devices": [ + { + "device": "dimm_proc 1 dimm 1", + "size": 8, + "technology": "dram" + } + ], + "network_adapters": [ + { + "device": "eth0", + "driver": "mlx_core", + "enabled": true, + "interface": "Ethernet", + "ip": "172.16.131.3", + "ip6": "2001:660:4406:800:4::3", + "kavlan": false, + "mac": "14:18:77:72:09:4c", + "management": false, + "mountable": true, + "mounted": true, + "name": "enp1s0f0np0", + "network_address": "esterel3-1.sophia.grid5000.fr", + "rate": 10000000000, + "switch": null, + "switch_port": null + }, + { + "device": "bmc", + "enabled": true, + "interface": "Ethernet", + "ip": "172.17.131.3", + "kavlan": false, + "mac": "14:18:77:72:09:4e", + "management": true, + "mountable": false, + "mounted": false, + "network_address": "esterel3-1-bmc.sophia.grid5000.fr" + } + ], + "nodeset": "esterel3", + "operating_system": { + "cstate_driver": "unknown", + "cstate_governor": "unknown", + "ht_enabled": true, + "pstate_driver": "unknwon", + "pstate_governor": "unknown", + "turboboost_enabled": true + }, + "performance": { + "core_flops": 128, + "node_flops": 9216 + }, + "processor": { + "cache_l1": null, + "cache_l1d": 8, + "cache_l1i": 8, + "cache_l2": 8, + "cache_l3": 8, + "clock_speed": 8, + "ht_capable": true, + "instruction_set": "x86-64", + "microarchitecture": "Haswell", + "microcode": "0xd000001", + "model": "Unknown", + "other_description": "description", + "vendor": "vendor", + "version": "vendor" + }, + "redfish": true, + "software": { + "forced-deployment-timestamp": 202007300948, + "postinstall-version": "1.2025032008", + "standard-environment": "debian11-x64-std" + }, + "storage_devices": [ + { + "by_id": "", + "by_path": "/dev/disk/by-path/dummy", + "id": "disk0", + "interface": "SAS", + "model": "unknown", + "size": 8, + "storage": "SSD", + "vendor": "Unknown" + } + ], + "supported_job_types": { + "besteffort": true, + "deploy": true, + "max_walltime": 0, + "queues": [ + "admin", + "testing" + ] + }, + "type": "node", + "uid": "esterel3-1" +} \ No newline at end of file diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml new file mode 100644 index 00000000000..bb691795c00 --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml @@ -0,0 +1,41 @@ +--- +model: Cluster Model # TODO: change this value. +created_at: 1970-01-01 # TODO: change this value +kavlan: false +boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice) +exotic: false # TODO: specify if 'true' or 'false' +queues: + - admin + - testing +nodes: + esterel3-1: + chassis: + manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line. + warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line. + supported_job_types: + deploy: true + besteffort: true + max_walltime: 0 + processor: + microarchitecture: Haswell # TODO: replace with microarch name. + clock_speed: 8 # TODO: Replace with clock speed. + network_adapters: + bmc: + interface: Ethernet + enabled: true + mountable: false + mounted: false + eth0: + enabled: true + mountable: true + mounted: true + storage_devices: + disk0: # This field will have to be renamed later. + id: disk0 + interface: SAS + by_path: "/dev/disk/by-path/dummy" # this path will have to change later. + software: + standard-environment: debian11-x64-std # TODO: check that architecture is OK + management_tools: + bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm) + nodeset: esterel3 diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3_metrics.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_metrics.yaml new file mode 100644 index 00000000000..729e9beb582 --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_metrics.yaml @@ -0,0 +1,40 @@ +--- +metrics: + - name: prom_default_metrics + description: Default subset of metrics from Prometheus Node Exporter + period: 0 + optional_period: 15000 + source: + protocol: prometheus + port: 9100 + id: + - node_boot_time_seconds + - node_cpu_scaling_frequency_hertz + - node_cpu_seconds_total + - node_filesystem_free_bytes + - node_filesystem_size_bytes + - node_load1 + - node_load15 + - node_load5 + - node_memory_Buffers_bytes + - node_memory_Cached_bytes + - node_memory_MemAvailable_bytes + - node_memory_MemFree_bytes + - node_memory_MemTotal_bytes + - node_memory_Shmem_bytes + - node_memory_SwapFree_bytes + - node_memory_SwapTotal_bytes + - node_network_receive_bytes_total + - node_network_receive_packets_total + - node_network_transmit_bytes_total + - node_network_transmit_packets_total + - node_procs_blocked + - node_procs_running + - kwollect_custom + - name: prom_all_metrics + description: All metrics from Prometheus Node Exporter + period: 0 + optional_period: 15000 + source: + protocol: prometheus + port: 9100 diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb new file mode 100644 index 00000000000..b3a7b90938d --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb @@ -0,0 +1,80 @@ +<% + # File generated by 'rake mass:create SRC=doc/sophia-clusters-mass-create-tmp.csv + # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create' + + cluster_name = "esterel3" + nodes_number = 1 # Size of the cluster (number of nodes) + # MAC addresses declaration + mac_eth0_list = %w( +14:18:77:72:09:4c + ) + mac_bmc_list = %w( +14:18:77:72:09:4e + ) +%> +--- +nodes: +<% (1..nodes_number).each { |i| %> + <%= cluster_name %>-<%= i %>: + architecture: + nb_procs: 1 # Fake data, will be replaced by g5k-checks + nb_cores: 72 # Fake data, will be replaced by g5k-checks + nb_threads: 72 # Fake data, will be replaced by g5k-checks + platform_type: x86_64 # Fake data, will be replaced by g5k-checks + cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks + bios: + release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks + vendor: Unknown # Fake vendor, will be replaced by g5k-checks + version: 1 # Fake version, will be replaced by g5k-checks + bmc_version: v1 # Fake version, will be replaced by g5k-checks + chassis: + manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks + name: Unknown # Fake name, will be replaced by g5k-checks + main_memory: + ram_size: 8 # Fake size, will be replaced by g5k-checks + memory_devices: + dimm: + size: 8 # Fake size, will be replaced by g5k-checks + technology: dram # Common memory technology, will be replaced by g5k-checks + processor: + model: Unknown # Fake model name, will be replaced by g5k-checks + other_description: description # Fake description, will be replaced by g5k-checks + vendor: vendor # Fake vendor, will be replaced by g5k-checks + version: vendor # Fake version, will be replaced by g5k-checks + cache_l1d: 8 # Fake cache, will be replaced by g5k-checks + cache_l1i: 8 # Fake cache, will be replaced by g5k-checks + cache_l2: 8 # Fake cache, will be replaced by g5k-checks + cache_l3: 8 # Fake cache, will be replaced by g5k-checks + instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks + microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks + ht_capable: true # Default ht capable value, will be replaced by g5k-checks + main_memory: + ram_size: 8 # Fake ram size, will be replaced by g5k-checks + memory_devices: + dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks + size: 8 # Fake dimm size, will be replaced by g5k-checks + technology: dram # Default dimm technology, will be replaced by g5k-checks + operating_system: + cstate_driver: unknown # Fake driver, will be replaced by g5k-checks + cstate_governor: unknown # Fake governor, will be replaced by g5k-checks + ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks + pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks + pstate_governor: unknown # Fake driver, will be replaced by g5k-checks + turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks + network_adapters: + bmc: + management: true + mac: <%= mac_bmc_list[i - 1] %> + eth0: + interface: Ethernet + management: false + driver: mlx_core # Fake data, will be replaced by g5k-checks + name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks + rate: 10000000000 # Fake data, will be replaced by g5k-checks + mac: <%= mac_eth0_list[i - 1] %> + storage_devices: + disk0: + storage: SSD # Fake data, will be replaced by g5k-checks + model: unknown # Fake data, will be replaced by g5k-checks + size: 8 # Fake data, will be replaced by g5k-checks +<% } %> -- GitLab From 86b3f3d2c0d61cccc02e2b27081e2486f6cf12d2 Mon Sep 17 00:00:00 2001 From: Nathan Paulin <nathan.paulin@inria.fr> Date: Mon, 24 Mar 2025 16:16:40 +0100 Subject: [PATCH 2/4] [sophia][esterel3] add basic conf --- .../sophia/clusters/esterel3/esterel3.json | 14 ++++++------- .../clusters/esterel3/nodes/esterel3-1.json | 20 +++++++++---------- .../sites/sophia/network_equipments/sw-6.json | 4 ++++ .../sophia/network_equipments/swadmin-6.json | 3 +++ .../sophia/clusters/esterel3/esterel3.yaml | 18 ++++++++--------- .../sophia/clusters/esterel3/nodes.yaml.erb | 2 +- .../grid5000/sites/sophia/networks/sw-6.yaml | 2 ++ .../sites/sophia/networks/swadmin-6.yaml | 3 +++ 8 files changed, 39 insertions(+), 27 deletions(-) diff --git a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json index 0a76dd75fa2..44f3af7cc3e 100644 --- a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json +++ b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json @@ -1,9 +1,9 @@ { - "boot_type": "uefi", - "created_at": "Thu, 01 Jan 1970 00:00:00 GMT", + "boot_type": "bios", + "created_at": "Tue, 25 Mar 2025 00:00:00 GMT", "exotic": false, "kavlan": false, - "manufactured_at": "1970-01-01", + "manufactured_at": "2016-06-06", "metrics": [ { "description": "Default subset of metrics from Prometheus Node Exporter", @@ -51,10 +51,10 @@ } } ], - "model": "Cluster Model", + "model": "Dell PowerEdge T630", "nodes_count": 1, - "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet", - "priority": 197001, + "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 1Gb Ethernet", + "priority": 201606, "queues": [ "admin", "testing" @@ -62,5 +62,5 @@ "redfish": true, "type": "cluster", "uid": "esterel3", - "warranty_end": "1970-01-01" + "warranty_end": "2021-06-06" } \ No newline at end of file diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json index 1d67776cc7b..00c80887277 100644 --- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json +++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json @@ -13,17 +13,17 @@ }, "bmc_version": "v1", "chassis": { - "manufactured_at": "1970-01-01", + "manufactured_at": "2016-06-06", "manufacturer": "Unknown", "name": "Unknown", - "warranty_end": "1970-01-01" + "warranty_end": "2021-06-06" }, "exotic": false, "main_memory": { "ram_size": 8 }, "management_tools": { - "bmc_vendor_tool": "ipmitool", + "bmc_vendor_tool": "racadm", "ipmitool": { "retries": 5 } @@ -50,9 +50,9 @@ "mounted": true, "name": "enp1s0f0np0", "network_address": "esterel3-1.sophia.grid5000.fr", - "rate": 10000000000, - "switch": null, - "switch_port": null + "rate": 1000000000, + "switch": "sw-6", + "switch_port": "1/1/2" }, { "device": "bmc", @@ -77,8 +77,8 @@ "turboboost_enabled": true }, "performance": { - "core_flops": 128, - "node_flops": 9216 + "core_flops": 35200000000, + "node_flops": 2534400000000 }, "processor": { "cache_l1": null, @@ -86,10 +86,10 @@ "cache_l1i": 8, "cache_l2": 8, "cache_l3": 8, - "clock_speed": 8, + "clock_speed": 2200000000, "ht_capable": true, "instruction_set": "x86-64", - "microarchitecture": "Haswell", + "microarchitecture": "Broadwell", "microcode": "0xd000001", "model": "Unknown", "other_description": "description", diff --git a/data/grid5000/sites/sophia/network_equipments/sw-6.json b/data/grid5000/sites/sophia/network_equipments/sw-6.json index 7a20eec66ce..9d88f2891c7 100644 --- a/data/grid5000/sites/sophia/network_equipments/sw-6.json +++ b/data/grid5000/sites/sophia/network_equipments/sw-6.json @@ -17,6 +17,10 @@ "uid": "esterel2-1" }, { + "kind": "node", + "port": "eth0", + "snmp_name": "1/1/2", + "uid": "esterel3-1" }, { "kind": "node", diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json index 40fc0278b2e..7447263a27a 100644 --- a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json +++ b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json @@ -53,6 +53,9 @@ "uid": "esterel2-1-bmc" }, { + "kind": "other", + "snmp_name": "1/1/10", + "uid": "esterel3-1-bmc" }, { "kind": "other", diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml index bb691795c00..8b0b42a614e 100644 --- a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml @@ -1,24 +1,24 @@ --- -model: Cluster Model # TODO: change this value. -created_at: 1970-01-01 # TODO: change this value +model: Dell PowerEdge T630 +created_at: 2025-03-25 kavlan: false -boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice) -exotic: false # TODO: specify if 'true' or 'false' +boot_type: bios +exotic: false queues: - admin - testing nodes: esterel3-1: chassis: - manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line. - warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line. + manufactured_at: 2016-06-06 + warranty_end: 2021-06-06 supported_job_types: deploy: true besteffort: true max_walltime: 0 processor: - microarchitecture: Haswell # TODO: replace with microarch name. - clock_speed: 8 # TODO: Replace with clock speed. + microarchitecture: Broadwell + clock_speed: 2_200_000_000 network_adapters: bmc: interface: Ethernet @@ -37,5 +37,5 @@ nodes: software: standard-environment: debian11-x64-std # TODO: check that architecture is OK management_tools: - bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm) + bmc_vendor_tool: racadm # TODO: replace with bmc_vendor_tool (ipmitool, racadm) nodeset: esterel3 diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb index b3a7b90938d..9db36481640 100644 --- a/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb +++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb @@ -70,7 +70,7 @@ nodes: management: false driver: mlx_core # Fake data, will be replaced by g5k-checks name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks - rate: 10000000000 # Fake data, will be replaced by g5k-checks + rate: 1000000000 # Fake data, will be replaced by g5k-checks mac: <%= mac_eth0_list[i - 1] %> storage_devices: disk0: diff --git a/input/grid5000/sites/sophia/networks/sw-6.yaml b/input/grid5000/sites/sophia/networks/sw-6.yaml index d31f048f0f5..8fa11090a97 100644 --- a/input/grid5000/sites/sophia/networks/sw-6.yaml +++ b/input/grid5000/sites/sophia/networks/sw-6.yaml @@ -16,6 +16,8 @@ sw-6: ports: 1: uid: esterel2-1 + 2: + uid: esterel3-1 3: uid: esterel4-1 13: diff --git a/input/grid5000/sites/sophia/networks/swadmin-6.yaml b/input/grid5000/sites/sophia/networks/swadmin-6.yaml index 1404c71e746..855dc203b31 100644 --- a/input/grid5000/sites/sophia/networks/swadmin-6.yaml +++ b/input/grid5000/sites/sophia/networks/swadmin-6.yaml @@ -38,6 +38,9 @@ swadmin-6: 9: uid: esterel2-1-bmc kind: other + 10: + uid: esterel3-1-bmc + kind: other 11: uid: esterel4-1-bmc kind: other -- GitLab From f340bdf04250eb87b11064be4b53dad9fd61c50c Mon Sep 17 00:00:00 2001 From: Nathan Paulin <nathan.paulin@inria.fr> Date: Tue, 25 Mar 2025 09:56:15 +0100 Subject: [PATCH 3/4] [sophia][esterel3] add disk by_path --- .../sites/sophia/clusters/esterel3/nodes/esterel3-1.json | 2 +- input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json index 00c80887277..9410758c465 100644 --- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json +++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json @@ -105,7 +105,7 @@ "storage_devices": [ { "by_id": "", - "by_path": "/dev/disk/by-path/dummy", + "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", "id": "disk0", "interface": "SAS", "model": "unknown", diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml index 8b0b42a614e..1aab8229d69 100644 --- a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml @@ -33,9 +33,9 @@ nodes: disk0: # This field will have to be renamed later. id: disk0 interface: SAS - by_path: "/dev/disk/by-path/dummy" # this path will have to change later. + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" software: - standard-environment: debian11-x64-std # TODO: check that architecture is OK + standard-environment: debian11-x64-std management_tools: - bmc_vendor_tool: racadm # TODO: replace with bmc_vendor_tool (ipmitool, racadm) + bmc_vendor_tool: racadm nodeset: esterel3 -- GitLab From 0d8142449c974cbd476af9132b99f97600508097 Mon Sep 17 00:00:00 2001 From: Nathan Paulin <nathan.paulin@inria.fr> Date: Tue, 25 Mar 2025 10:57:35 +0100 Subject: [PATCH 4/4] [sophia][esterel3] Add predictable network interfaces mapping --- .../sophia/clusters/esterel3/esterel3.json | 4 +- .../clusters/esterel3/nodes/esterel3-1.json | 210 +++++++++++++++--- input/grid5000/dell-product-data.yaml | 6 + input/grid5000/ipv4.yaml | 1 + .../sophia/clusters/esterel3/esterel3.yaml | 10 +- .../sophia/clusters/esterel3/esterel3_ib.yaml | 9 + .../sophia/clusters/esterel3/nodes.yaml.erb | 80 ------- .../clusters/esterel3/nodes/esterel3-1.yaml | 142 ++++++++++++ lib/refrepo/net_names_mapping.yaml | 4 + 9 files changed, 344 insertions(+), 122 deletions(-) create mode 100644 input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml delete mode 100644 input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb create mode 100644 input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml diff --git a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json index 44f3af7cc3e..147ee11b544 100644 --- a/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json +++ b/data/grid5000/sites/sophia/clusters/esterel3/esterel3.json @@ -53,8 +53,8 @@ ], "model": "Dell PowerEdge T630", "nodes_count": 1, - "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 1Gb Ethernet", - "priority": 201606, + "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 4 GPUs GeForce GTX TITAN X, 48GB RAM, 1862GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand", + "priority": 201706, "queues": [ "admin", "testing" diff --git a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json index 9410758c465..5936ae13538 100644 --- a/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json +++ b/data/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.json @@ -1,26 +1,97 @@ { "architecture": { - "cpu_core_numbering": "contiguous", - "nb_cores": 72, - "nb_procs": 1, - "nb_threads": 72, + "cpu_core_numbering": "round-robin", + "nb_cores": 20, + "nb_procs": 2, + "nb_threads": 40, "platform_type": "x86_64" }, "bios": { - "release_date": "01/01/2000", - "vendor": "Unknown", - "version": 1 + "release_date": "10/18/2023", + "vendor": "Dell Inc.", + "version": "2.18.2" }, - "bmc_version": "v1", + "bmc_version": "2.85.85.85", "chassis": { "manufactured_at": "2016-06-06", - "manufacturer": "Unknown", - "name": "Unknown", + "manufacturer": "Dell Inc.", + "name": "PowerEdge T630", + "serial": "DPSDDD2", "warranty_end": "2021-06-06" }, "exotic": false, + "gpu_devices": { + "nvidia0": { + "compute_capability": "5.2", + "cores": 3072, + "cpu_affinity": 0, + "device": "/dev/nvidia0", + "memory": 12884901888, + "microarchitecture": "Maxwell", + "model": "GeForce GTX TITAN X", + "performance": { + "fp-16": 0, + "fp-32": 66050000000000, + "fp-64": 206500000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "84.00.45.00.03", + "vendor": "Nvidia" + }, + "nvidia1": { + "compute_capability": "5.2", + "cores": 3072, + "cpu_affinity": 0, + "device": "/dev/nvidia1", + "memory": 12884901888, + "microarchitecture": "Maxwell", + "model": "GeForce GTX TITAN X", + "performance": { + "fp-16": 0, + "fp-32": 66050000000000, + "fp-64": 206500000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "84.00.45.00.03", + "vendor": "Nvidia" + }, + "nvidia2": { + "compute_capability": "5.2", + "cores": 3072, + "cpu_affinity": 1, + "device": "/dev/nvidia2", + "memory": 12884901888, + "microarchitecture": "Maxwell", + "model": "GeForce GTX TITAN X", + "performance": { + "fp-16": 0, + "fp-32": 66050000000000, + "fp-64": 206500000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "84.00.45.00.03", + "vendor": "Nvidia" + }, + "nvidia3": { + "compute_capability": "5.2", + "cores": 3072, + "cpu_affinity": 1, + "device": "/dev/nvidia3", + "memory": 12884901888, + "microarchitecture": "Maxwell", + "model": "GeForce GTX TITAN X", + "performance": { + "fp-16": 0, + "fp-32": 66050000000000, + "fp-64": 206500000000 + }, + "power_default_limit": "250.00 W", + "vbios_version": "84.00.45.00.03", + "vendor": "Nvidia" + } + }, "main_memory": { - "ram_size": 8 + "ram_size": 51539607552 }, "management_tools": { "bmc_vendor_tool": "racadm", @@ -30,29 +101,96 @@ }, "memory_devices": [ { - "device": "dimm_proc 1 dimm 1", - "size": 8, + "device": "dimm_a1", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_a2", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_a3", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_b1", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_b2", + "size": 8589934592, + "technology": "dram" + }, + { + "device": "dimm_b3", + "size": 8589934592, "technology": "dram" } ], "network_adapters": [ { "device": "eth0", - "driver": "mlx_core", + "driver": "igb", "enabled": true, + "firmware_version": "1.67, 0x80000fae, 19.5.12", "interface": "Ethernet", "ip": "172.16.131.3", "ip6": "2001:660:4406:800:4::3", "kavlan": false, "mac": "14:18:77:72:09:4c", "management": false, + "model": "I350 Gigabit Network Connection", "mountable": true, "mounted": true, "name": "enp1s0f0np0", "network_address": "esterel3-1.sophia.grid5000.fr", "rate": 1000000000, + "sriov": false, + "sriov_totalvfs": 0, "switch": "sw-6", - "switch_port": "1/1/2" + "switch_port": "1/1/2", + "vendor": "Intel" + }, + { + "device": "eth1", + "driver": "igb", + "enabled": false, + "firmware_version": "1.67, 0x80000fae, 19.5.12", + "interface": "Ethernet", + "kavlan": false, + "mac": "14:18:77:72:09:4d", + "management": false, + "model": "I350 Gigabit Network Connection", + "mountable": false, + "mounted": false, + "name": "eno2", + "sriov": false, + "sriov_totalvfs": 0, + "vendor": "Intel" + }, + { + "device": "ib0", + "driver": "mlx4_core", + "enabled": true, + "firmware_version": "2.35.5100", + "guid": "0xe41d2d030050bc51", + "interface": "InfiniBand", + "ip": "172.18.131.3", + "kavlan": false, + "mac": "e4:1d:2d:03:00:50:bc:51", + "management": false, + "model": "MT27500 Family [ConnectX-3]", + "mountable": true, + "mounted": true, + "name": "ib0", + "netmask": "255.255.240.0", + "network_address": "esterel3-1-ib0.sophia.grid5000.fr", + "rate": 40000000000, + "vendor": "Mellanox Technologies" }, { "device": "bmc", @@ -69,32 +207,32 @@ ], "nodeset": "esterel3", "operating_system": { - "cstate_driver": "unknown", - "cstate_governor": "unknown", + "cstate_driver": "intel_idle", + "cstate_governor": "menu", "ht_enabled": true, - "pstate_driver": "unknwon", - "pstate_governor": "unknown", + "pstate_driver": "intel_cpufreq", + "pstate_governor": "performance", "turboboost_enabled": true }, "performance": { "core_flops": 35200000000, - "node_flops": 2534400000000 + "node_flops": 704000000000 }, "processor": { "cache_l1": null, - "cache_l1d": 8, - "cache_l1i": 8, - "cache_l2": 8, - "cache_l3": 8, + "cache_l1d": 32768, + "cache_l1i": 32768, + "cache_l2": 262144, + "cache_l3": 26214400, "clock_speed": 2200000000, "ht_capable": true, "instruction_set": "x86-64", "microarchitecture": "Broadwell", - "microcode": "0xd000001", - "model": "Unknown", - "other_description": "description", - "vendor": "vendor", - "version": "vendor" + "microcode": "0xb000040", + "model": "Intel Xeon", + "other_description": "Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz", + "vendor": "Intel", + "version": "E5-2630 v4" }, "redfish": true, "software": { @@ -104,14 +242,15 @@ }, "storage_devices": [ { - "by_id": "", + "by_id": "/dev/disk/by-id/wwn-0x61866da05411b8001ef5b7930c395ada", "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0", + "firmware_version": 4.3, "id": "disk0", "interface": "SAS", - "model": "unknown", - "size": 8, - "storage": "SSD", - "vendor": "Unknown" + "model": "PERC H730 Adp", + "size": 1999307276288, + "storage": "HDD", + "vendor": "Dell" } ], "supported_job_types": { @@ -121,7 +260,8 @@ "queues": [ "admin", "testing" - ] + ], + "virtual": "ivt" }, "type": "node", "uid": "esterel3-1" diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml index f1109449749..8365f2e7455 100644 --- a/input/grid5000/dell-product-data.yaml +++ b/input/grid5000/dell-product-data.yaml @@ -2244,6 +2244,12 @@ sites: chassis: manufactured_at: 2020-10-30 warranty_end: 2027-10-31 + esterel3: + nodes: + esterel3-1: + chassis: + manufactured_at: 2016-06-06 + warranty_end: 2021-06-06 esterel4: nodes: esterel4-1: diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index bf76b1af44d..1e8210b4134 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -159,6 +159,7 @@ ipv4: sophia esterel2 eth0 0 0 3 1 sophia esterel2 ib0 0 0 3 1 sophia esterel3 eth0 0 0 3 2 + sophia esterel3 ib0 0 0 3 2 sophia esterel4 eth0 0 0 3 3 sophia esterel4 ib0 0 0 3 3 sophia esterel5 eth0 0 0 3 4 diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml index 1aab8229d69..90a02fbb166 100644 --- a/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3.yaml @@ -9,9 +9,6 @@ queues: - testing nodes: esterel3-1: - chassis: - manufactured_at: 2016-06-06 - warranty_end: 2021-06-06 supported_job_types: deploy: true besteffort: true @@ -29,11 +26,14 @@ nodes: enabled: true mountable: true mounted: true + eth1: + enabled: false + mountable: false + mounted: false storage_devices: - disk0: # This field will have to be renamed later. + pci-0000:03:00.0-scsi-0:2:0:0: id: disk0 interface: SAS - by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" software: standard-environment: debian11-x64-std management_tools: diff --git a/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml new file mode 100644 index 00000000000..33f292f988c --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/esterel3_ib.yaml @@ -0,0 +1,9 @@ +--- +nodes: + esterel3-1: + network_adapters: + ib0: + enabled: true + mountable: true + mounted: true + netmask: 255.255.240.0 \ No newline at end of file diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb deleted file mode 100644 index 9db36481640..00000000000 --- a/input/grid5000/sites/sophia/clusters/esterel3/nodes.yaml.erb +++ /dev/null @@ -1,80 +0,0 @@ -<% - # File generated by 'rake mass:create SRC=doc/sophia-clusters-mass-create-tmp.csv - # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create' - - cluster_name = "esterel3" - nodes_number = 1 # Size of the cluster (number of nodes) - # MAC addresses declaration - mac_eth0_list = %w( -14:18:77:72:09:4c - ) - mac_bmc_list = %w( -14:18:77:72:09:4e - ) -%> ---- -nodes: -<% (1..nodes_number).each { |i| %> - <%= cluster_name %>-<%= i %>: - architecture: - nb_procs: 1 # Fake data, will be replaced by g5k-checks - nb_cores: 72 # Fake data, will be replaced by g5k-checks - nb_threads: 72 # Fake data, will be replaced by g5k-checks - platform_type: x86_64 # Fake data, will be replaced by g5k-checks - cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks - bios: - release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks - vendor: Unknown # Fake vendor, will be replaced by g5k-checks - version: 1 # Fake version, will be replaced by g5k-checks - bmc_version: v1 # Fake version, will be replaced by g5k-checks - chassis: - manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks - name: Unknown # Fake name, will be replaced by g5k-checks - main_memory: - ram_size: 8 # Fake size, will be replaced by g5k-checks - memory_devices: - dimm: - size: 8 # Fake size, will be replaced by g5k-checks - technology: dram # Common memory technology, will be replaced by g5k-checks - processor: - model: Unknown # Fake model name, will be replaced by g5k-checks - other_description: description # Fake description, will be replaced by g5k-checks - vendor: vendor # Fake vendor, will be replaced by g5k-checks - version: vendor # Fake version, will be replaced by g5k-checks - cache_l1d: 8 # Fake cache, will be replaced by g5k-checks - cache_l1i: 8 # Fake cache, will be replaced by g5k-checks - cache_l2: 8 # Fake cache, will be replaced by g5k-checks - cache_l3: 8 # Fake cache, will be replaced by g5k-checks - instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks - microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks - ht_capable: true # Default ht capable value, will be replaced by g5k-checks - main_memory: - ram_size: 8 # Fake ram size, will be replaced by g5k-checks - memory_devices: - dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks - size: 8 # Fake dimm size, will be replaced by g5k-checks - technology: dram # Default dimm technology, will be replaced by g5k-checks - operating_system: - cstate_driver: unknown # Fake driver, will be replaced by g5k-checks - cstate_governor: unknown # Fake governor, will be replaced by g5k-checks - ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks - pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks - pstate_governor: unknown # Fake driver, will be replaced by g5k-checks - turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks - network_adapters: - bmc: - management: true - mac: <%= mac_bmc_list[i - 1] %> - eth0: - interface: Ethernet - management: false - driver: mlx_core # Fake data, will be replaced by g5k-checks - name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks - rate: 1000000000 # Fake data, will be replaced by g5k-checks - mac: <%= mac_eth0_list[i - 1] %> - storage_devices: - disk0: - storage: SSD # Fake data, will be replaced by g5k-checks - model: unknown # Fake data, will be replaced by g5k-checks - size: 8 # Fake data, will be replaced by g5k-checks -<% } %> diff --git a/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml new file mode 100644 index 00000000000..9ead050b211 --- /dev/null +++ b/input/grid5000/sites/sophia/clusters/esterel3/nodes/esterel3-1.yaml @@ -0,0 +1,142 @@ +# Generated by g5k-checks (g5k-checks -m api) +--- +esterel3-1: + architecture: + cpu_core_numbering: round-robin + nb_cores: 20 + nb_procs: 2 + nb_threads: 40 + platform_type: x86_64 + bios: + release_date: 10/18/2023 + vendor: Dell Inc. + version: 2.18.2 + bmc_version: 2.85.85.85 + chassis: + manufacturer: Dell Inc. + name: PowerEdge T630 + serial: DPSDDD2 + gpu_devices: + nvidia0: + cpu_affinity: 0 + device: "/dev/nvidia0" + memory: 12884901888 + model: GeForce GTX TITAN X + power_default_limit: 250.00 W + vbios_version: 84.00.45.00.03 + vendor: Nvidia + nvidia1: + cpu_affinity: 0 + device: "/dev/nvidia1" + memory: 12884901888 + model: GeForce GTX TITAN X + power_default_limit: 250.00 W + vbios_version: 84.00.45.00.03 + vendor: Nvidia + nvidia2: + cpu_affinity: 1 + device: "/dev/nvidia2" + memory: 12884901888 + model: GeForce GTX TITAN X + power_default_limit: 250.00 W + vbios_version: 84.00.45.00.03 + vendor: Nvidia + nvidia3: + cpu_affinity: 1 + device: "/dev/nvidia3" + memory: 12884901888 + model: GeForce GTX TITAN X + power_default_limit: 250.00 W + vbios_version: 84.00.45.00.03 + vendor: Nvidia + main_memory: + ram_size: 51539607552 + memory_devices: + dimm_a1: + size: 8589934592 + technology: dram + dimm_a2: + size: 8589934592 + technology: dram + dimm_a3: + size: 8589934592 + technology: dram + dimm_b1: + size: 8589934592 + technology: dram + dimm_b2: + size: 8589934592 + technology: dram + dimm_b3: + size: 8589934592 + technology: dram + network_adapters: + bmc: + ip: 172.17.131.3 + mac: 14:18:77:72:09:4e + management: true + eth0: + driver: igb + firmware_version: 1.67, 0x80000fae, 19.5.12 + interface: Ethernet + ip: 172.16.131.3 + mac: 14:18:77:72:09:4c + management: false + model: I350 Gigabit Network Connection + name: enp1s0f0np0 + rate: 1000000000 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + eth1: + driver: igb + firmware_version: 1.67, 0x80000fae, 19.5.12 + interface: Ethernet + mac: 14:18:77:72:09:4d + management: false + model: I350 Gigabit Network Connection + name: eno2 + sriov: false + sriov_totalvfs: 0 + vendor: Intel + ib0: + driver: mlx4_core + firmware_version: 2.35.5100 + guid: '0xe41d2d030050bc51' + interface: InfiniBand + ip: 172.18.131.3 + mac: e4:1d:2d:03:00:50:bc:51 + management: false + model: MT27500 Family [ConnectX-3] + name: ib0 + rate: 40000000000 + vendor: Mellanox Technologies + operating_system: + cstate_driver: intel_idle + cstate_governor: menu + ht_enabled: true + pstate_driver: intel_cpufreq + pstate_governor: performance + turboboost_enabled: true + processor: + cache_l1d: 32768 + cache_l1i: 32768 + cache_l2: 262144 + cache_l3: 26214400 + ht_capable: true + instruction_set: x86-64 + microcode: '0xb000040' + model: Intel Xeon + other_description: Intel(R) Xeon(R) CPU E5-2630 v4 @ 2.20GHz + vendor: Intel + version: E5-2630 v4 + storage_devices: + pci-0000:03:00.0-scsi-0:2:0:0: + by_id: "/dev/disk/by-id/wwn-0x61866da05411b8001ef5b7930c395ada" + by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" + firmware_version: 4.3 + model: PERC H730 Adp + size: 1999307276288 + storage: HDD + supported_job_types: + virtual: ivt diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml index c96999dac05..145cebec70d 100644 --- a/lib/refrepo/net_names_mapping.yaml +++ b/lib/refrepo/net_names_mapping.yaml @@ -398,6 +398,10 @@ esterel1: eno3: eth2 eno4: eth3 ibp131s0: ib0 +esterel3: + enp1s0f0np0: eth0 + eno2: eth1 + ibp130s0: ib0 esterel4: enp1s0f0np0: eth0 eno2: eth1 -- GitLab