diff --git a/src/oomd/cfgen/src/cfgen.rs b/src/oomd/cfgen/src/cfgen.rs index 2322641d..ce4e65da 100644 --- a/src/oomd/cfgen/src/cfgen.rs +++ b/src/oomd/cfgen/src/cfgen.rs @@ -798,6 +798,9 @@ fn use_high_mem_pressure_threshold_on_dev(node: &Node) -> bool { { return true; } + if node.hostname_prefix() == DEV && node.server_type() == FbServerType::TYPE_X_SEARCH { + return true; + } false } diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/dev_T10.json b/src/oomd/cfgen/test/cfgen_test_inputs/dev_T10.json new file mode 100644 index 00000000..c9147e1e --- /dev/null +++ b/src/oomd/cfgen/test/cfgen_test_inputs/dev_T10.json @@ -0,0 +1,115 @@ +@generated SignedSource<<1b04e482d078b9270d62aea7afad6ab2>> +@codegen-command arc cfgen update-inputs fb-oomd +{ + "fqdn": "dev0050.snc8.facebook.com", + "region": "west", + "clusterType": "SERVICE_GENERIC_NON_MEMCACHE", + "modelId": 341072, + "kernelRelease": "5.19.0-0_fbk12_hardened_11583_g0bef9520ca2b", + "serverType": "TYPE_X_SEARCH", + "experiments": [], + "cpuArchitecture": "cooperlake", + "metalosRootfs": false, + "provisioningConfig": { + "ethtoolByInterface": { + "eth0": { + "maxChannelsCombined": 52 + } + }, + "cpuCoreCount": 26, + "parentModelId": 338998, + "recoveryEnvironment": false, + "deviceType": "SERVER", + "datacenter": "snc8", + "cluster": "02", + "memTotal": 66872942592, + "osVersion": { + "distribution_name": "CentOS Stream release", + "version": 9, + "is_in_ramdisk": false, + "is_metalos": false + }, + "pciByAddress": { + "0000:65:00.0": { + "vendor_id": 5555, + "device_id": 4125, + "class_code": 131072, + "board_part_number": "MCX623435MC-CDAE_FB", + "current_speed_mts": 8000, + "current_width": 4 + } + }, + "static_smc_tiers": [], + "machine": "x86_64" + }, + "bootConfig": { + "ethtoolByInterface": { + "eth0": { + "driver": "mlx5_core", + "driver_version": "5.19.0-0_fbk12_hardened_11583_g", + "firmware_version": "22.32.1206 (FB_0000000018)", + "bus_info": "0000:65:00.0", + "speed_mbps": 100000 + } + } + }, + "runtimeConfig": { + "hasHighPrivCert": true, + "regionRoutableCluster": "prn3.06", + "block_devices": { + "block_devices": { + "nvme0n1": { + "size_bytes": 256055095296, + "is_rotational": false, + "model": "WDC CL SN720 SDAQNTW-512G-1020", + "serial": "21090A806417", + "physical_block_size": 512, + "logical_block_size": 512, + "is_root": true + }, + "nvme1n1": { + "size_bytes": 1800360124416, + "is_rotational": false, + "model": "MZOL21T9HCJR-000FB", + "serial": "S5X8NG0R817377", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false + } + } + }, + "dynamic_smc_tiers": [], + "cluster_state": "CLUSTER_IN_USE", + "installed_platforms": [ + "platform009", + "platform010", + "platform010-aarch64", + "platform010-compat" + ], + "device_nics_enum": [ + "ETH0", + "SVC0" + ], + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/nvme0n1p4", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } + }, + "reservationConfig": {} +} diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/devbig.json b/src/oomd/cfgen/test/cfgen_test_inputs/devbig.json index 9dbdad94..20f7c894 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/devbig.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/devbig.json @@ -1,7 +1,7 @@ -@generated SignedSource<> +@generated SignedSource<<7d0d8bd34d42990af455d354ddcf98ad>> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "devbig470.ash8.facebook.com", + "fqdn": "devbig414.ash8.facebook.com", "region": "east", "clusterType": "SERVICE_GENERIC_NON_MEMCACHE", "modelId": 336209, @@ -64,7 +64,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "798S10ART7RQ", + "serial": "798S1078T7RQ", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -73,7 +73,7 @@ "size_bytes": 2000398934016, "is_rotational": true, "model": "TOSHIBA MG04ACA200A", - "serial": "89CVK6BJFKGA", + "serial": "79P4K06WFKGA", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": true @@ -92,7 +92,25 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/sda3", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/devgpu_T17.json b/src/oomd/cfgen/test/cfgen_test_inputs/devgpu_T17.json index 72918e88..61f8b11f 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/devgpu_T17.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/devgpu_T17.json @@ -1,7 +1,7 @@ -@generated SignedSource<> +@generated SignedSource<<9dc5ee399ebc4b3207dbae5ab683d296>> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "devgpu119.cco2.facebook.com", + "fqdn": "devgpu110.cco2.facebook.com", "region": "crookcounty", "clusterType": "SERVICE_GENERIC_NON_MEMCACHE", "modelId": 347673, @@ -30,8 +30,8 @@ "recoveryEnvironment": false, "deviceType": "SERVER", "datacenter": "cco2", - "cluster": "03", - "memTotal": 2434647334912, + "cluster": "04", + "memTotal": 2434641825792, "osVersion": { "distribution_name": "CentOS Stream release", "version": 9, @@ -113,10 +113,10 @@ "block_devices": { "block_devices": { "nvme0n1": { - "size_bytes": 3760740458496, + "size_bytes": 3600709410816, "is_rotational": false, "model": "MZOL63T8HDLT-00AFB", - "serial": "S77UNG0W800873", + "serial": "S77UNG0W800655", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -125,34 +125,34 @@ "size_bytes": 3760740458496, "is_rotational": false, "model": "MZOL63T8HDLT-00AFB", - "serial": "S77UNG0W801214", + "serial": "S77UNG0W801154", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": true }, "nvme2n1": { - "size_bytes": 3760740458496, + "size_bytes": 3600709410816, "is_rotational": false, "model": "MZOL63T8HDLT-00AFB", - "serial": "S77UNG0W800880", + "serial": "S77UNG0W800614", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false }, "nvme3n1": { - "size_bytes": 3760740458496, + "size_bytes": 3600709410816, "is_rotational": false, "model": "MZOL63T8HDLT-00AFB", - "serial": "S77UNG0W800871", + "serial": "S77UNG0W800617", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false }, "nvme4n1": { - "size_bytes": 3760740458496, + "size_bytes": 3600709410816, "is_rotational": false, "model": "MZOL63T8HDLT-00AFB", - "serial": "S77UNG0W800872", + "serial": "S77UNG0W800610", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -172,12 +172,28 @@ "ETH1", "ETH2", "ETH3", - "SVC0", - "SVC0_1", - "SVC0_2", - "SVC0_3" + "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/nvme1n1p4", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/devgpu_non_T17.json b/src/oomd/cfgen/test/cfgen_test_inputs/devgpu_non_T17.json index 7b42b70e..f795ab98 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/devgpu_non_T17.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/devgpu_non_T17.json @@ -1,82 +1,74 @@ -@generated SignedSource<<486052c4f88e685d95686103a221f720>> +@generated SignedSource<> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "devgpu030.cln3.facebook.com", - "region": "ireland", + "fqdn": "devgpu013.cco3.facebook.com", + "region": "crookcounty", "clusterType": "SERVICE_GENERIC_NON_MEMCACHE", - "modelId": 342698, - "kernelRelease": "5.12.0-0_fbk16_zion_7661_geb00762ce6d2", + "modelId": 348652, + "kernelRelease": "6.4.3-0_fbk10_zion_2498_ge6d54711039b", "serverType": "TYPE_XVI_TRAINING", "experiments": [], - "cpuArchitecture": "cooperlake", + "cpuArchitecture": "genoa", "metalosRootfs": false, "provisioningConfig": { "ethtoolByInterface": { "eth0": { - "maxChannelsCombined": 128, - "maxChannelsRx": 64, - "maxChannelsTx": 64 + "maxChannelsCombined": 63 }, "eth1": { - "maxChannelsCombined": 128, - "maxChannelsRx": 64, - "maxChannelsTx": 64 + "maxChannelsCombined": 63 }, "eth2": { - "maxChannelsCombined": 128, - "maxChannelsRx": 64, - "maxChannelsTx": 64 + "maxChannelsCombined": 63 }, "eth3": { - "maxChannelsCombined": 128, - "maxChannelsRx": 64, - "maxChannelsTx": 64 + "maxChannelsCombined": 63 } }, - "cpuCoreCount": 96, - "parentModelId": 342332, + "cpuCoreCount": 192, + "parentModelId": 343729, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "cln3", + "datacenter": "cco3", "cluster": "03", - "memTotal": 1621535821824, + "memTotal": 2434410749952, "osVersion": { "distribution_name": "CentOS Stream release", - "version": 8, + "version": 9, "is_in_ramdisk": false, "is_metalos": false }, "pciByAddress": { - "0000:30:00.0": { - "vendor_id": 5348, - "device_id": 5969, + "0000:2b:00.0": { + "vendor_id": 5555, + "device_id": 4129, "class_code": 131072, - "board_part_number": "BCM957504-N1100FZB", - "current_speed_mts": 8000, + "board_part_number": "CX71343DAC-WEBF_FB", + "current_speed_mts": 32000, "current_width": 16 }, - "0000:6d:00.0": { - "vendor_id": 5348, - "device_id": 5969, + "0000:2b:00.1": { + "vendor_id": 5555, + "device_id": 4129, "class_code": 131072, - "board_part_number": "BCM957504-N1100FZB", - "current_speed_mts": 8000, + "board_part_number": "CX71343DAC-WEBF_FB", + "current_speed_mts": 32000, "current_width": 16 }, - "0000:ad:00.0": { - "vendor_id": 5348, - "device_id": 5969, + "0000:cb:00.0": { + "vendor_id": 5555, + "device_id": 4129, "class_code": 131072, - "board_part_number": "BCM957504-N1100FZB", - "current_speed_mts": 8000, + "board_part_number": "CX71343DAC-WEBF_FB", + "current_speed_mts": 32000, "current_width": 16 }, - "0000:ed:00.0": { - "vendor_id": 5348, - "device_id": 5969, + "0000:cb:00.1": { + "vendor_id": 5555, + "device_id": 4129, "class_code": 131072, - "board_part_number": "BCM957504-N1100FZB", - "current_speed_mts": 8000, + "board_part_number": "CX71343DAC-WEBF_FB", + "current_speed_mts": 32000, "current_width": 16 } }, @@ -86,81 +78,117 @@ "bootConfig": { "ethtoolByInterface": { "eth0": { - "driver": "bnxt_en", - "driver_version": "5.12.0-0_fbk16_zion_7661_geb007", - "firmware_version": "216.2.252.0/pkg 216.2.317.0", - "bus_info": "0000:30:00.0", - "speed_mbps": 100000 + "driver": "mlx5_core", + "driver_version": "6.4.3-0_fbk10_zion_2498_ge6d547", + "firmware_version": "28.38.1002 (FB_0000000038)", + "bus_info": "0000:2b:00.0", + "speed_mbps": 200000 }, "eth1": { - "driver": "bnxt_en", - "driver_version": "5.12.0-0_fbk16_zion_7661_geb007", - "firmware_version": "216.2.252.0/pkg 216.2.317.0", - "bus_info": "0000:6d:00.0", - "speed_mbps": 100000 + "driver": "mlx5_core", + "driver_version": "6.4.3-0_fbk10_zion_2498_ge6d547", + "firmware_version": "28.38.1002 (FB_0000000038)", + "bus_info": "0000:2b:00.1", + "speed_mbps": 200000 }, "eth2": { - "driver": "bnxt_en", - "driver_version": "5.12.0-0_fbk16_zion_7661_geb007", - "firmware_version": "216.2.252.0/pkg 216.2.317.0", - "bus_info": "0000:ad:00.0", - "speed_mbps": 100000 + "driver": "mlx5_core", + "driver_version": "6.4.3-0_fbk10_zion_2498_ge6d547", + "firmware_version": "28.38.1002 (FB_0000000038)", + "bus_info": "0000:cb:00.0", + "speed_mbps": 200000 }, "eth3": { - "driver": "bnxt_en", - "driver_version": "5.12.0-0_fbk16_zion_7661_geb007", - "firmware_version": "216.2.252.0/pkg 216.2.317.0", - "bus_info": "0000:ed:00.0", - "speed_mbps": 100000 + "driver": "mlx5_core", + "driver_version": "6.4.3-0_fbk10_zion_2498_ge6d547", + "firmware_version": "28.38.1002 (FB_0000000038)", + "bus_info": "0000:cb:00.1", + "speed_mbps": 200000 } } }, "runtimeConfig": { "hasHighPrivCert": true, - "regionRoutableCluster": "cln1.02", + "regionRoutableCluster": "cco1.02", "block_devices": { "block_devices": { "nvme0n1": { - "size_bytes": 512110190592, + "size_bytes": 3600709410816, "is_rotational": false, - "model": "KXG6AZNV512G TOSHIBA", - "serial": "62EFC2K1F5F5", - "physical_block_size": 512, - "logical_block_size": 512, - "is_root": true + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719487", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false }, "nvme1n1": { - "size_bytes": 1920383410176, + "size_bytes": 3760740458496, "is_rotational": false, - "model": "KXD51LN11T92 TOSHIBA", - "serial": "X1AS10HKTX4M", + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719367", "physical_block_size": 4096, "logical_block_size": 4096, - "is_root": false + "is_root": true }, "nvme2n1": { - "size_bytes": 1920383410176, + "size_bytes": 3600709410816, "is_rotational": false, - "model": "KXD51LN11T92 TOSHIBA", - "serial": "X1AS10HFTX4M", + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719475", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false }, "nvme3n1": { - "size_bytes": 1920383410176, + "size_bytes": 3600709410816, "is_rotational": false, - "model": "KXD51LN11T92 TOSHIBA", - "serial": "X1HS105BTX4M", + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719382", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false }, "nvme4n1": { - "size_bytes": 1920383410176, + "size_bytes": 3600709410816, "is_rotational": false, - "model": "KXD51LN11T92 TOSHIBA", - "serial": "X1HS10V2TX4M", + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719383", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false + }, + "nvme5n1": { + "size_bytes": 3600709410816, + "is_rotational": false, + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719390", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false + }, + "nvme6n1": { + "size_bytes": 3600709410816, + "is_rotational": false, + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719484", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false + }, + "nvme7n1": { + "size_bytes": 3600709410816, + "is_rotational": false, + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719486", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false + }, + "nvme8n1": { + "size_bytes": 3600709410816, + "is_rotational": false, + "model": "MZOL63T8HDLT-00AFB", + "serial": "S77UNG0W719489", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -170,10 +198,6 @@ "dynamic_smc_tiers": [], "cluster_state": "CLUSTER_IN_USE", "installed_platforms": [ - "gcc-4.9-glibc-2.20", - "gcc-4.9-glibc-2.20-fb", - "gcc-5-glibc-2.23", - "platform007", "platform009", "platform010", "platform010-aarch64", @@ -189,12 +213,26 @@ "SVC0_2", "SVC0_3" ], - "loaded_kernel_modules": [ - { - "name": "nvidia", - "version": "525.105.17\n" - } - ] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/nvme1n1p4", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/devvm.json b/src/oomd/cfgen/test/cfgen_test_inputs/devvm.json index 96a9a98a..f296213c 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/devvm.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/devvm.json @@ -1,8 +1,8 @@ -@generated SignedSource<> +@generated SignedSource<<02e6fb8a7cdb40852565254f0c5f9f88>> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "devvm12299.vll0.facebook.com", - "region": "newmexico", + "fqdn": "devvm11340.nha0.facebook.com", + "region": "alabama", "clusterType": "DEV", "modelId": 4077, "kernelRelease": "5.12.0-0_fbk16_hardened_7661_geb00762ce6d2", @@ -16,13 +16,13 @@ "maxChannelsCombined": 8 } }, - "cpuCoreCount": 36, - "parentModelId": 333245, + "cpuCoreCount": 28, + "parentModelId": 344135, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "vll0", + "datacenter": "nha0", "cluster": "01", - "memTotal": 119924961280, + "memTotal": 119920975872, "osVersion": { "distribution_name": "CentOS Stream release", "version": 9, @@ -52,12 +52,12 @@ }, "runtimeConfig": { "hasHighPrivCert": true, - "regionRoutableCluster": "vll1.02", + "regionRoutableCluster": "nha1.02", "block_devices": { "block_devices": { "vda": { "vendor": "0x1af4", - "size_bytes": 751619276800, + "size_bytes": 1717986918400, "is_rotational": true, "physical_block_size": 512, "logical_block_size": 512, diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/devvm_with_samll_ram.json b/src/oomd/cfgen/test/cfgen_test_inputs/devvm_with_samll_ram.json index 07ea0dc3..5486bebe 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/devvm_with_samll_ram.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/devvm_with_samll_ram.json @@ -1,4 +1,4 @@ -@generated SignedSource<<7094d5f857ef7db387134b6aaa98ec53>> +@generated SignedSource<<565b203d3a6cb5e4156d7650e2eb7ec8>> @codegen-command arc cfgen update-inputs fb-oomd { "fqdn": "devvm010.atn6.facebook.com", @@ -77,7 +77,26 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/vda3", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/dns.json b/src/oomd/cfgen/test/cfgen_test_inputs/dns.json index 498e229c..b8c56caa 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/dns.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/dns.json @@ -1,4 +1,4 @@ -@generated SignedSource<<2aa0add5b5055cf204c9eb09ae869424>> +@generated SignedSource<<5d7ba59674719d5764b671101130e9a5>> @codegen-command arc cfgen update-inputs fb-oomd { "fqdn": "dns09.10.vll1.facebook.com", @@ -79,7 +79,26 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/nvme0n1p4", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": {} } diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/fna_shard00.json b/src/oomd/cfgen/test/cfgen_test_inputs/fna_shard00.json index 243d8f3c..3a7c7dfc 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/fna_shard00.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/fna_shard00.json @@ -1,45 +1,46 @@ -@generated SignedSource<<77a12826ffacd49093dab7d916d4ce1c>> +@generated SignedSource<<353d3dad5c34e79a6a0ce00ae4a7498e>> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "fna007.01.futp1.facebook.com", + "fqdn": "fna009.03.ffru1.facebook.com", "region": "other", "clusterType": "FNA", - "modelId": 342361, - "kernelRelease": "5.19.0-0_fbk21_hardened_rc9_12630_gab30f3f5259a", + "modelId": 337011, + "kernelRelease": "5.19.0-0_fbk21_hardened_12633_g4db063a1bcb5", "serverType": "TYPE_VI_FEED", "experiments": [], - "cpuArchitecture": "icelake", + "cpuArchitecture": "skylake", "metalosRootfs": false, "provisioningConfig": { "ethtoolByInterface": { "eth0": { - "maxChannelsCombined": 63 + "maxChannelsRx": 80, + "maxChannelsTx": 32 }, "ip6tnl0": {}, "tunl0": {}, "tunlany0": {} }, - "cpuCoreCount": 48, + "cpuCoreCount": 40, "parentModelId": 328972, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "futp1", - "cluster": "01", - "memTotal": 265750892544, + "datacenter": "ffru1", + "cluster": "03", + "memTotal": 269953454080, "osVersion": { - "distribution_name": "EdgeOS", - "version": 1708953544, + "distribution_name": "CentOS Stream release 9", + "version": 1718035827, "is_in_ramdisk": false, - "is_metalos": false + "is_edgeos": true }, "pciByAddress": { - "0000:47:00.0": { + "0000:5d:00.0": { "vendor_id": 5555, - "device_id": 4125, - "class_code": 131072, - "board_part_number": "MCX623435AC-CDAI", - "current_speed_mts": 16000, - "current_width": 16 + "device_id": 4103, + "class_code": 163840, + "board_part_number": "764285-B21", + "current_speed_mts": 8000, + "current_width": 8 } }, "static_smc_tiers": [], @@ -48,29 +49,29 @@ "bootConfig": { "ethtoolByInterface": { "eth0": { - "driver": "mlx5_core", - "driver_version": "5.19.0-0_fbk21_hardened_rc9_126", - "firmware_version": "22.34.4000 (MT_0000000695)", - "bus_info": "0000:47:00.0", - "speed_mbps": 100000 + "driver": "mlx4_en", + "driver_version": "4.0-0", + "firmware_version": "2.42.5700", + "bus_info": "0000:5d:00.0", + "speed_mbps": 40000 }, "ip6tnl0": { "driver": "ip6tnl", - "driver_version": "5.19.0-0_fbk21_hardened_rc9_126", + "driver_version": "5.19.0-0_fbk21_hardened_12633_g", "firmware_version": "", "bus_info": "", "speed_mbps": 0 }, "tunl0": { "driver": "ipip", - "driver_version": "5.19.0-0_fbk21_hardened_rc9_126", + "driver_version": "5.19.0-0_fbk21_hardened_12633_g", "firmware_version": "", "bus_info": "", "speed_mbps": 0 }, "tunlany0": { "driver": "ip6tnl", - "driver_version": "5.19.0-0_fbk21_hardened_rc9_126", + "driver_version": "5.19.0-0_fbk21_hardened_12633_g", "firmware_version": "", "bus_info": "", "speed_mbps": 0 @@ -83,31 +84,31 @@ "block_devices": { "block_devices": { "nvme0n1": { - "size_bytes": 3840755982336, + "size_bytes": 4000787030016, "is_rotational": false, - "model": "SAMSUNG MZQL23T8HCLS-00A07", - "serial": "S64HNJ0T644493", + "model": "INTEL SSDPE2KX040T8", + "serial": "PHLJ1233026H4P0DGN", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false }, "nvme1n1": { - "size_bytes": 960197124096, + "size_bytes": 4000787030016, "is_rotational": false, - "model": "SAMSUNG MZQL2960HCJR-00A07", - "serial": "S64FNE0T407240", + "model": "INTEL SSDPE2KX040T8", + "serial": "PHLJ123401GH4P0DGN", "physical_block_size": 4096, - "logical_block_size": 512, - "is_root": true + "logical_block_size": 4096, + "is_root": false }, - "nvme2n1": { - "size_bytes": 3840755982336, + "sda": { + "size_bytes": 480103981056, "is_rotational": false, - "model": "SAMSUNG MZQL23T8HCLS-00A07", - "serial": "S64HNJ0T644491", + "model": "INTEL SSDSC2KB480G8", + "serial": "PHYF110006EP480BGN", "physical_block_size": 4096, - "logical_block_size": 4096, - "is_root": false + "logical_block_size": 512, + "is_root": true } } }, diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/fnedge.json b/src/oomd/cfgen/test/cfgen_test_inputs/fnedge.json index a6b194ca..4a3c8532 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/fnedge.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/fnedge.json @@ -1,8 +1,8 @@ -@generated SignedSource<> +@generated SignedSource<<74a652dfe9f8d0cea1580b0ab87e5afe>> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "fnedge624.03.sin6.facebook.com", - "region": "oregon", + "fqdn": "fnedge337.01.ord5.facebook.com", + "region": "altoona", "clusterType": "POP", "modelId": 342539, "kernelRelease": "5.19.0-0_fbk21_hardened_rc9_12630_gab30f3f5259a", @@ -21,11 +21,11 @@ "tunlany0": {} }, "cpuCoreCount": 40, - "parentModelId": 334413, + "parentModelId": 334411, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "sin6", - "cluster": "03", + "datacenter": "ord5", + "cluster": "01", "memTotal": 269953482752, "osVersion": { "distribution_name": "EdgeOS", @@ -80,14 +80,14 @@ }, "runtimeConfig": { "hasHighPrivCert": true, - "regionRoutableCluster": "prn3.06", + "regionRoutableCluster": "atn1.05", "block_devices": { "block_devices": { "nvme0n1": { "size_bytes": 3840755982336, "is_rotational": false, "model": "SAMSUNG MZQLB3T8HALS-00007", - "serial": "S438NC0R840659", + "serial": "S438NC0R901648", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -96,7 +96,7 @@ "size_bytes": 3840755982336, "is_rotational": false, "model": "SAMSUNG MZQLB3T8HALS-00007", - "serial": "S438NA0N755299", + "serial": "S438NA0N704959", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -105,7 +105,7 @@ "size_bytes": 480103981056, "is_rotational": false, "model": "VK000480GWSRR", - "serial": "S4NANA0N724609", + "serial": "S4NANA0N631380", "physical_block_size": 4096, "logical_block_size": 512, "is_root": true @@ -120,6 +120,7 @@ ], "device_nics_enum": [ "ETH0", + "ETH1", "SVC0" ], "loaded_kernel_modules": [], diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/gedge.json b/src/oomd/cfgen/test/cfgen_test_inputs/gedge.json index fadcbc5c..e46d8fff 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/gedge.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/gedge.json @@ -1,46 +1,45 @@ -@generated SignedSource<> +@generated SignedSource<> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "gedge774.50.ord5.facebook.com", - "region": "altoona", + "fqdn": "gedge566.50.ams6.facebook.com", + "region": "denmark", "clusterType": "GAMING_POP", - "modelId": 340028, + "modelId": 342616, "kernelRelease": "5.12.0-0_fbk16_hardened_7661_geb00762ce6d2", "serverType": "TYPE_VI_FEED", "experiments": [], - "cpuArchitecture": "skylake", + "cpuArchitecture": "icelake", "metalosRootfs": false, "provisioningConfig": { "ethtoolByInterface": { "eth0": { - "maxChannelsRx": 80, - "maxChannelsTx": 32 + "maxChannelsCombined": 63 }, "ip6tnl0": {}, "tunl0": {}, "tunlany0": {} }, - "cpuCoreCount": 40, - "parentModelId": 339661, + "cpuCoreCount": 48, + "parentModelId": 343431, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "ord5", + "datacenter": "ams6", "cluster": "50", - "memTotal": 202312957952, + "memTotal": 265756499968, "osVersion": { "distribution_name": "EdgeOS", - "version": 1700056342, + "version": 1708953544, "is_in_ramdisk": false, "is_metalos": false }, "pciByAddress": { - "0000:5d:00.0": { + "0000:47:00.0": { "vendor_id": 5555, - "device_id": 4103, - "class_code": 163840, - "board_part_number": "764285-B21", - "current_speed_mts": 8000, - "current_width": 8 + "device_id": 4125, + "class_code": 131072, + "board_part_number": "MCX623435AC-CDAI", + "current_speed_mts": 16000, + "current_width": 16 } }, "static_smc_tiers": [], @@ -49,11 +48,11 @@ "bootConfig": { "ethtoolByInterface": { "eth0": { - "driver": "mlx4_en", - "driver_version": "4.0-0", - "firmware_version": "2.42.5700", - "bus_info": "0000:5d:00.0", - "speed_mbps": 40000 + "driver": "mlx5_core", + "driver_version": "5.12.0-0_fbk16_hardened_7661_ge", + "firmware_version": "22.34.4000 (MT_0000000695)", + "bus_info": "0000:47:00.0", + "speed_mbps": 100000 }, "ip6tnl0": { "driver": "", @@ -80,23 +79,34 @@ }, "runtimeConfig": { "hasHighPrivCert": true, - "regionRoutableCluster": "atn1.05", + "regionRoutableCluster": "odn2.02", "block_devices": { "block_devices": { - "sda": { - "size_bytes": 1920383410176, + "nvme0n1": { + "size_bytes": 960197124096, "is_rotational": false, - "model": "VK001920GWTTC", - "serial": "PHYF021301PN1P9DGN", + "model": "SAMSUNG MZQL2960HCJR-00A07", + "serial": "S64FNE0RC04186", "physical_block_size": 4096, "logical_block_size": 512, "is_root": true + }, + "nvme1n1": { + "size_bytes": 3840755982336, + "is_rotational": false, + "model": "SAMSUNG MZQL23T8HCLS-00A07", + "serial": "S64HNS0T800572", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false } } }, "dynamic_smc_tiers": [ - "edge_pool_gedge.ord5c50", - "edge_pool_gedge.ord5c50.spare" + "edge_pool_gedge.ams6c50", + "edge_pool_gedge.ams6c50.cathode_windows", + "edge_pool_gedge.ams6c50.cathode_windows.prod", + "edge_pool_gedge.ams6c50.cathode_windows.prod.gen10plus_a10m" ], "cluster_state": "CLUSTER_IN_USE", "installed_platforms": [ @@ -105,16 +115,10 @@ ], "device_nics_enum": [ "ETH0", - "ETH1", "SVC0", "SVC1" ], - "loaded_kernel_modules": [ - { - "name": "nvidia", - "version": "525.105.17\n" - } - ], + "loaded_kernel_modules": [], "mounts": { "mounts": [ { diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/ondemand.json b/src/oomd/cfgen/test/cfgen_test_inputs/ondemand.json index 9ea73267..66a95ca5 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/ondemand.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/ondemand.json @@ -1,28 +1,30 @@ -@generated SignedSource<<9137f5f4108f4dc3bf9d1468f1a71500>> +@generated SignedSource<<0e3f14b2398b8a574059b35ad967b33f>> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "od0533.atn6.facebook.com", - "region": "altoona", + "fqdn": "od4427.prn1.facebook.com", + "region": "oregon", "clusterType": "SERVICE_GENERIC_NON_MEMCACHE", - "modelId": 333245, + "modelId": 334305, "kernelRelease": "5.19.0-0_fbk12_11583_g0bef9520ca2b", - "serverType": "TYPE_VI_FEED", + "serverType": "TYPE_X_SEARCH", "experiments": [], - "cpuArchitecture": "skylake", + "cpuArchitecture": "skylakede", "metalosRootfs": false, "provisioningConfig": { "ethtoolByInterface": { "eth0": { - "maxChannelsCombined": 63 + "maxChannelsCombined": 16, + "maxChannelsRx": 16, + "maxChannelsTx": 16 } }, - "cpuCoreCount": 40, - "parentModelId": 335261, + "cpuCoreCount": 18, + "parentModelId": 334304, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "atn6", - "cluster": "10", - "memTotal": 270019448832, + "datacenter": "prn1", + "cluster": "48", + "memTotal": 66999205888, "osVersion": { "distribution_name": "CentOS Stream release", "version": 9, @@ -30,13 +32,13 @@ "is_metalos": false }, "pciByAddress": { - "0000:5e:00.0": { - "vendor_id": 5555, - "device_id": 4117, + "0000:02:00.0": { + "vendor_id": 5348, + "device_id": 5873, "class_code": 131072, - "board_part_number": "MCX4411D-ACAN_FB", + "board_part_number": "BCM957452M4520C", "current_speed_mts": 8000, - "current_width": 8 + "current_width": 2 } }, "static_smc_tiers": [], @@ -45,36 +47,45 @@ "bootConfig": { "ethtoolByInterface": { "eth0": { - "driver": "mlx5_core", + "driver": "bnxt_en", "driver_version": "5.19.0-0_fbk12_11583_g0bef9520c", - "firmware_version": "14.27.2606 (FB_0000000005)", - "bus_info": "0000:5e:00.0", - "speed_mbps": 25000 + "firmware_version": "20.8.200.0/pkg 20.8.3.11", + "bus_info": "0000:02:00.0", + "speed_mbps": 50000 } } }, "runtimeConfig": { "hasHighPrivCert": true, - "regionRoutableCluster": "atn1.05", + "regionRoutableCluster": "prn3.06", "block_devices": { "block_devices": { "nvme0n1": { - "size_bytes": 1600321314816, + "size_bytes": 512110190592, "is_rotational": false, - "model": "SAMSUNG MZ1LB1T9HALS-000FB", - "serial": "S4JTNA0N402027", + "model": "HFS512GD9TNG-62A0A", + "serial": "MJ04N606113904D3S", + "physical_block_size": 512, + "logical_block_size": 512, + "is_root": true + }, + "nvme1n1": { + "size_bytes": 500107862016, + "is_rotational": false, + "model": "SAMSUNG MZ1LB960HAJQ-000FB", + "serial": "S4S2NA0N660582", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false }, - "sda": { - "size_bytes": 2000398934016, - "is_rotational": true, - "model": "ST2000NM0008-2F3100", - "serial": "ZDS1BR40", - "physical_block_size": 512, - "logical_block_size": 512, - "is_root": true + "nvme2n1": { + "size_bytes": 500107862016, + "is_rotational": false, + "model": "SAMSUNG MZ1LB960HAJQ-000FB", + "serial": "S4S2NA0N660565", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false } } }, @@ -88,7 +99,26 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/nvme0n1p4", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/synmon.json b/src/oomd/cfgen/test/cfgen_test_inputs/synmon.json index 36cc4cad..32478506 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/synmon.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/synmon.json @@ -1,30 +1,30 @@ -@generated SignedSource<<568fcfec1e7dea508ee35fb5bd03c455>> +@generated SignedSource<> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "synmon063.ftw5.facebook.com", - "region": "texas", + "fqdn": "synmon061.snb1.facebook.com", + "region": "springfield", "clusterType": "SERVICE_GENERIC_NON_MEMCACHE", - "modelId": 333376, + "modelId": 346252, "kernelRelease": "5.19.0-0_fbk12_11583_g0bef9520ca2b", "serverType": "TYPE_I_WEB", "experiments": [], - "cpuArchitecture": "skylakede", + "cpuArchitecture": "bergamo", "metalosRootfs": false, "provisioningConfig": { "ethtoolByInterface": { "eth0": { - "maxChannelsCombined": 16, - "maxChannelsRx": 16, - "maxChannelsTx": 16 + "maxChannelsCombined": 128, + "maxChannelsRx": 64, + "maxChannelsTx": 64 } }, - "cpuCoreCount": 18, - "parentModelId": 334303, + "cpuCoreCount": 88, + "parentModelId": 344026, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "ftw5", - "cluster": "07", - "memTotal": 66999590912, + "datacenter": "snb1", + "cluster": "01", + "memTotal": 269764808704, "osVersion": { "distribution_name": "CentOS Stream release", "version": 9, @@ -32,13 +32,13 @@ "is_metalos": false }, "pciByAddress": { - "0000:02:00.0": { + "0000:01:00.0": { "vendor_id": 5348, - "device_id": 5873, + "device_id": 5969, "class_code": 131072, - "board_part_number": "BCM957452M4520C", - "current_speed_mts": 8000, - "current_width": 2 + "board_part_number": "BCM957504-N1100FH", + "current_speed_mts": 16000, + "current_width": 4 } }, "static_smc_tiers": [], @@ -49,22 +49,22 @@ "eth0": { "driver": "bnxt_en", "driver_version": "5.19.0-0_fbk12_11583_g0bef9520c", - "firmware_version": "20.8.200.0/pkg 20.8.3.11", - "bus_info": "0000:02:00.0", + "firmware_version": "225.0.157.0/pkg 225.1.109.0", + "bus_info": "0000:01:00.0", "speed_mbps": 50000 } } }, "runtimeConfig": { "hasHighPrivCert": true, - "regionRoutableCluster": "ftw1.02", + "regionRoutableCluster": "snb1.01", "block_devices": { "block_devices": { "nvme0n1": { - "size_bytes": 512110190592, + "size_bytes": 819367632896, "is_rotational": false, - "model": "WDC CL SN720 SDAQNTW-512G-1020", - "serial": "200454808928", + "model": "KXG8AZNV1T02", + "serial": "372393FC60N6EC5U", "physical_block_size": 512, "logical_block_size": 512, "is_root": true @@ -81,7 +81,26 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/nvme0n1p4", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twpool.json b/src/oomd/cfgen/test/cfgen_test_inputs/twpool.json index ed482692..ed5a1a92 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/twpool.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/twpool.json @@ -1,4 +1,4 @@ -@generated SignedSource<<024f46792aaeef8f33f86b090f280fad>> +@generated SignedSource<> @codegen-command arc cfgen update-inputs fb-oomd { "fqdn": "tw066.02.cln2.facebook.com", @@ -79,7 +79,26 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/nvme0n1p4", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twpool_no_senpai.json b/src/oomd/cfgen/test/cfgen_test_inputs/twpool_no_senpai.json index f9d77a32..7baaae8e 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/twpool_no_senpai.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/twpool_no_senpai.json @@ -1,4 +1,4 @@ -@generated SignedSource<> +@generated SignedSource<<4fa4e93433d44539a18aa6ebc14b8acb>> @codegen-command arc cfgen update-inputs fb-oomd { "fqdn": "tw130.03.ldc2.facebook.com", @@ -81,7 +81,25 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/sda4", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled.json b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled.json index 192ef4f2..a7fd83ad 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled.json @@ -1,4 +1,4 @@ -@generated SignedSource<> +@generated SignedSource<> @codegen-command arc cfgen update-inputs fb-oomd { "fqdn": "twshared44829.07.ash9.facebook.com", @@ -92,7 +92,25 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/sda3", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "discard", + "space_cache=v2", + "subvolid=5", + "subvol=/" + ] + } + ] + } }, "reservationConfig": { "active_machine_materialization_id": "6321b443b7f1a", diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled_sandisk.json b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled_sandisk.json index 1fe8de79..7c0c7e33 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled_sandisk.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled_sandisk.json @@ -1,4 +1,4 @@ -@generated SignedSource<> +@generated SignedSource<<056a97c966ec5254dca1f4a92ae0d37c>> @codegen-command arc cfgen update-inputs fb-oomd { "fqdn": "twshared15369.35.frc1.facebook.com", @@ -95,10 +95,29 @@ "ETH0", "SVC0" ], - "loaded_kernel_modules": [] + "loaded_kernel_modules": [], + "mounts": { + "mounts": [ + { + "device": "/dev/sda2", + "mount_point": "/", + "fstype": "btrfs", + "mount_options": [ + "rw", + "relatime", + "compress-force=zstd:3", + "ssd", + "discard=async", + "space_cache=v2", + "subvolid=289", + "subvol=/volume/run/boot/0:7ad4f0ac546b408cbfa438e60ca967f7" + ] + } + ] + } }, "reservationConfig": { - "active_machine_materialization_id": "63d2bf3f97b2d", - "current_reservation_host_profile_id": "KERNEL:kernel_6.4.3-0_fbk2_785_gacbb203ea6ff_base.v0|KERNEL_ARGS:kargs_consoleS057600.v1|BOOT_CONFIG:bootloader692_initrd208_swap16G_native_arch" + "active_machine_materialization_id": "61231fc2a5767", + "current_reservation_host_profile_id": "KERNEL:kernel_6.4.3-0_fbk2_785_gacbb203ea6ff_base.v0|POWER:CPU_PERF_OPT|KERNEL_ARGS:kargs_consoleS057600.v1|BOOT_CONFIG:bootloader692_initrd208_swap16G_native_arch" } } diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_t20_zionex.json b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_t20_zionex.json index 063ed3a0..f209a2f5 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_t20_zionex.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_t20_zionex.json @@ -1,51 +1,51 @@ -@generated SignedSource<<19c84af36c5cd5cc5a073d8ce89fe6c6>> +@generated SignedSource<<098946a436107fba1cd2232c3f885f4d>> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "twshared29250.02.pnb5.facebook.com", - "region": "nebraska", + "fqdn": "twshared40687.05.nha1.facebook.com", + "region": "alabama", "clusterType": "SERVICE_GENERIC_NON_MEMCACHE", "modelId": 341690, - "kernelRelease": "6.4.3-0_fbk10_zion_rc9_2482_g96807ccfca35", + "kernelRelease": "6.4.3-0_fbk11_zion_2563_g44ec95f7d7f4", "serverType": "TYPE_XX_GPU_TC", "experiments": [], "cpuArchitecture": "cooperlake", "metalosRootfs": false, "provisioningConfig": { "ethtoolByInterface": { - "eth0": { + "beth0": { "maxChannelsCombined": 63 }, - "eth1": { + "beth1": { "maxChannelsCombined": 63 }, - "eth10": { + "beth2": { "maxChannelsCombined": 63 }, - "eth11": { + "beth3": { "maxChannelsCombined": 63 }, - "eth2": { + "beth4": { "maxChannelsCombined": 63 }, - "eth3": { + "beth5": { "maxChannelsCombined": 63 }, - "eth4": { + "beth6": { "maxChannelsCombined": 63 }, - "eth5": { + "beth7": { "maxChannelsCombined": 63 }, - "eth6": { + "eth0": { "maxChannelsCombined": 63 }, - "eth7": { + "eth1": { "maxChannelsCombined": 63 }, - "eth8": { + "eth2": { "maxChannelsCombined": 63 }, - "eth9": { + "eth3": { "maxChannelsCombined": 63 } }, @@ -53,9 +53,9 @@ "parentModelId": 341983, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "pnb5", - "cluster": "02", - "memTotal": 1621459365888, + "datacenter": "nha1", + "cluster": "05", + "memTotal": 1621459357696, "osVersion": { "distribution_name": "CentOS Stream release", "version": 9, @@ -165,102 +165,102 @@ }, "bootConfig": { "ethtoolByInterface": { - "eth0": { - "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", - "firmware_version": "22.32.1206 (FB_0000000025)", - "bus_info": "0000:30:00.0", - "speed_mbps": 100000 - }, - "eth1": { - "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", - "firmware_version": "22.32.1206 (FB_0000000025)", - "bus_info": "0000:6d:00.0", - "speed_mbps": 100000 - }, - "eth10": { + "beth0": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", "firmware_version": "22.38.1002 (FB_0000000028)", - "bus_info": "0000:ce:00.0", + "bus_info": "0000:4e:00.0", "speed_mbps": 200000 }, - "eth11": { + "beth1": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", "firmware_version": "22.38.1002 (FB_0000000028)", - "bus_info": "0000:4d:00.0", + "bus_info": "0000:17:00.0", "speed_mbps": 200000 }, - "eth2": { + "beth2": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", - "firmware_version": "22.32.1206 (FB_0000000025)", - "bus_info": "0000:ad:00.0", - "speed_mbps": 100000 - }, - "eth3": { - "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", - "firmware_version": "22.32.1206 (FB_0000000025)", - "bus_info": "0000:ed:00.0", - "speed_mbps": 100000 - }, - "eth4": { - "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", "firmware_version": "22.38.1002 (FB_0000000028)", - "bus_info": "0000:4e:00.0", + "bus_info": "0000:8d:00.0", "speed_mbps": 200000 }, - "eth5": { + "beth3": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", "firmware_version": "22.38.1002 (FB_0000000028)", - "bus_info": "0000:17:00.0", + "bus_info": "0000:8e:00.0", "speed_mbps": 200000 }, - "eth6": { + "beth4": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", "firmware_version": "22.38.1002 (FB_0000000028)", - "bus_info": "0000:8d:00.0", + "bus_info": "0000:16:00.0", "speed_mbps": 200000 }, - "eth7": { + "beth5": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", "firmware_version": "22.38.1002 (FB_0000000028)", - "bus_info": "0000:8e:00.0", + "bus_info": "0000:cd:00.0", "speed_mbps": 200000 }, - "eth8": { + "beth6": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", "firmware_version": "22.38.1002 (FB_0000000028)", - "bus_info": "0000:16:00.0", + "bus_info": "0000:ce:00.0", "speed_mbps": 200000 }, - "eth9": { + "beth7": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk10_zion_rc9_2482_g96", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", "firmware_version": "22.38.1002 (FB_0000000028)", - "bus_info": "0000:cd:00.0", + "bus_info": "0000:4d:00.0", "speed_mbps": 200000 + }, + "eth0": { + "driver": "mlx5_core", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", + "firmware_version": "22.32.1206 (FB_0000000025)", + "bus_info": "0000:30:00.0", + "speed_mbps": 100000 + }, + "eth1": { + "driver": "mlx5_core", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", + "firmware_version": "22.32.1206 (FB_0000000025)", + "bus_info": "0000:6d:00.0", + "speed_mbps": 100000 + }, + "eth2": { + "driver": "mlx5_core", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", + "firmware_version": "22.32.1206 (FB_0000000025)", + "bus_info": "0000:ad:00.0", + "speed_mbps": 100000 + }, + "eth3": { + "driver": "mlx5_core", + "driver_version": "6.4.3-0_fbk11_zion_2563_g44ec95", + "firmware_version": "22.32.1206 (FB_0000000025)", + "bus_info": "0000:ed:00.0", + "speed_mbps": 100000 } } }, "runtimeConfig": { "hasHighPrivCert": true, - "regionRoutableCluster": "pnb1.02", + "regionRoutableCluster": "nha1.02", "block_devices": { "block_devices": { "nvme0n1": { "size_bytes": 256055095296, "is_rotational": false, - "model": "MTFDHBA512TCK", - "serial": "21303085AF4D", + "model": "KXG6AZNV512G TOSHIBA", + "serial": "31QF77MPFJM3", "physical_block_size": 512, "logical_block_size": 512, "is_root": false @@ -269,7 +269,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS10B1TX4M", + "serial": "11RS10JBTX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -278,7 +278,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS102RTX4M", + "serial": "11RS104NTX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -287,7 +287,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS10JKTX4M", + "serial": "11RS10IZTX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -296,7 +296,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS10JYTX4M", + "serial": "11RS105STX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -305,7 +305,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS10J7TX4M", + "serial": "11RS1068TX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -314,7 +314,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "213S11H7TX3M", + "serial": "11US11E9TX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": true @@ -323,25 +323,25 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71HS10DETX4M", + "serial": "11US11CBTX3M", "physical_block_size": 4096, "logical_block_size": 4096, - "is_root": false + "is_root": true }, "nvme17n1": { "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "213S11OWTX3M", + "serial": "11RS10D4TX3M", "physical_block_size": 4096, "logical_block_size": 4096, - "is_root": true + "is_root": false }, "nvme18n1": { "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71HS10EJTX4M", + "serial": "11RS10CWTX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -350,7 +350,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71HS105RTX4M", + "serial": "11RS106YTX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -359,7 +359,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS1092TX4M", + "serial": "11RS105VTX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -368,7 +368,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS109ATX4M", + "serial": "11RS1040TX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -377,7 +377,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS10IBTX4M", + "serial": "11RS1065TX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -386,7 +386,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS1093TX4M", + "serial": "11RS107JTX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -395,7 +395,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS108HTX4M", + "serial": "11RS10K6TX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -404,7 +404,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS1075TX4M", + "serial": "11RS1053TX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -413,7 +413,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS104DTX4M", + "serial": "11RS10IITX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -422,7 +422,7 @@ "size_bytes": 1920383410176, "is_rotational": false, "model": "KXD51LN11T92 TOSHIBA", - "serial": "71CS10E6TX4M", + "serial": "11RS104VTX3M", "physical_block_size": 4096, "logical_block_size": 4096, "is_root": false @@ -441,6 +441,14 @@ "ETH1", "ETH2", "ETH3", + "BETH0", + "BETH1", + "BETH2", + "BETH3", + "BETH4", + "BETH5", + "BETH6", + "BETH7", "SVC0", "SVC0_1", "SVC0_2", @@ -473,7 +481,7 @@ } }, "reservationConfig": { - "active_machine_materialization_id": "619582331fe99", - "current_reservation_host_profile_id": "KERNEL:kernel_6.4.3-0_fbk10_zion_rc9_2482_g96807ccfca35_nvidia_535.154.05_base.v0|POWER:CPU_PERF_OPT|KERNEL_ARGS:kargs_crashkernel384M_multinic.v0|BOOT_CONFIG:bootloader814_initrd230_swap16G_native_arch|DRIVER_ARGS:t20_zionex_nvidia_driver_args.v1" + "active_machine_materialization_id": "61707f96ea04c", + "current_reservation_host_profile_id": "KERNEL:kernel_6.4.3-0_fbk11_zion_2563_g44ec95f7d7f4_nvidia_535.154.05_base.v0|POWER:CPU_PERF_OPT|KERNEL_ARGS:kargs_crashkernel384M_multinic.v0|BOOT_CONFIG:bootloader814_initrd230_swap16G_native_arch|DRIVER_ARGS:t20_zionex_nvidia_driver_args.v1|OS:CLASSIC" } } diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_vll_shard00.json b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_vll_shard00.json index 4456d5cb..061754b4 100644 --- a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_vll_shard00.json +++ b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_vll_shard00.json @@ -1,12 +1,12 @@ -@generated SignedSource<> +@generated SignedSource<<9f273028f0f3c33f65be5bf3e16fdf96>> @codegen-command arc cfgen update-inputs fb-oomd { - "fqdn": "twshared3453.02.vll5.facebook.com", + "fqdn": "twshared50059.05.vll6.facebook.com", "region": "newmexico", "clusterType": "SERVICE_GENERIC_NON_MEMCACHE", - "modelId": 340325, - "kernelRelease": "6.4.3-0_fbk2_785_gacbb203ea6ff", - "serverType": "TYPE_I_WEB", + "modelId": 343171, + "kernelRelease": "6.4.3-0_fbk12_2624_g7d95a0297d81", + "serverType": "TYPE_X_SEARCH", "experiments": [], "cpuArchitecture": "cooperlake", "metalosRootfs": true, @@ -17,21 +17,21 @@ } }, "cpuCoreCount": 26, - "parentModelId": 338977, + "parentModelId": 338998, "recoveryEnvironment": false, "deviceType": "SERVER", - "datacenter": "vll5", - "cluster": "02", - "memTotal": 66861379584, + "datacenter": "vll6", + "cluster": "05", + "memTotal": 66860978176, "osVersion": { "distribution_name": "CentOS Stream", "version": 9, "is_in_ramdisk": false, - "is_metalos": true, + "is_edgeos": false, "metalos_variant": "MclassicA" }, "pciByAddress": { - "0000:67:00.0": { + "0000:65:00.0": { "vendor_id": 5555, "device_id": 4125, "class_code": 131072, @@ -47,9 +47,9 @@ "ethtoolByInterface": { "eth0": { "driver": "mlx5_core", - "driver_version": "6.4.3-0_fbk2_785_gacbb203ea6ff", + "driver_version": "6.4.3-0_fbk12_2624_g7d95a0297d8", "firmware_version": "22.32.1206 (FB_0000000018)", - "bus_info": "0000:67:00.0", + "bus_info": "0000:65:00.0", "speed_mbps": 100000 } } @@ -77,10 +77,19 @@ "size_bytes": 256055095296, "is_rotational": false, "model": "HFS512GDE9X083N", - "serial": "3121CJA8N4571129075Q", + "serial": "3922CJBAN4118106031S", "physical_block_size": 512, "logical_block_size": 512, "is_root": true + }, + "nvme1n1": { + "size_bytes": 1920924123136, + "is_rotational": false, + "model": "HFS1T9GDEZX106N", + "serial": "3922CDBAN4116I470M1E", + "physical_block_size": 4096, + "logical_block_size": 4096, + "is_root": false } } }, @@ -109,15 +118,15 @@ "ssd", "discard=async", "space_cache=v2", - "subvolid=290", - "subvol=/volume/run/boot/0:8cf6da86942d41fba03f81807e61e2b5" + "subvolid=475", + "subvol=/volume/run/boot/0:f5f869cbf2e94dcdbd98e2be3d8dd537" ] } ] } }, "reservationConfig": { - "active_machine_materialization_id": "618ac90fa5475", - "current_reservation_host_profile_id": "COMMON:ZSWAP_DEFAULT|KERNEL:kernel_6.4.3-0_fbk2_785_gacbb203ea6ff_base.v0|KERNEL_ARGS:kargs_crashkernel192M.v1|BOOT_CONFIG:bootloader814_initrd230_swap16G_native_arch" + "active_machine_materialization_id": "5ef2669df1e8f", + "current_reservation_host_profile_id": "COMMON:NO_CPU_CONTROLLER|KERNEL:kernel_6.4.3-0_fbk12_2624_g7d95a0297d81_base.v0|STORAGE:RAW_HIGH_PERFORMANCE_V1|POWER:CPU_PERF_OPT|RUNTIME:TAO_NETWORK|KERNEL_ARGS:kargs_crashkernel192M.v1|BOOT_CONFIG:bootloader957_initrd253_swap32G_native_arch|OS:MCLASSICA" } } diff --git a/src/oomd/cfgen/test/cfgen_test_manifest.yml b/src/oomd/cfgen/test/cfgen_test_manifest.yml index ce7f0d73..fa57a028 100644 --- a/src/oomd/cfgen/test/cfgen_test_manifest.yml +++ b/src/oomd/cfgen/test/cfgen_test_manifest.yml @@ -47,3 +47,6 @@ samples: scuba: tier='devgpu' AND server_type!='TYPE_XVII_INFERENCE' devgpu_T17: scuba: tier='devgpu' AND server_type='TYPE_XVII_INFERENCE' + dev_T10: + # serf get --fields 'name' --limit 100 'hostnameScheme_obj.name=dev,server_type=TYPE_X_SEARCH' + production_host: dev0050.snc8.facebook.com diff --git a/src/oomd/cfgen/test/cfgen_test_outputs/dev_T10/50-change-propagator.conf b/src/oomd/cfgen/test/cfgen_test_outputs/dev_T10/50-change-propagator.conf new file mode 100644 index 00000000..c44ba252 --- /dev/null +++ b/src/oomd/cfgen/test/cfgen_test_outputs/dev_T10/50-change-propagator.conf @@ -0,0 +1,6 @@ +@generated SignedSource<<3dd8c7637bb7afa680fc168e9c49060d>> +@codegen-command arc cfgen update-outputs fb-oomd +[Service] +Environment=OOMD_ARGS='--interval 1 --config /etc/oomd2.json --drop-in-dir /run/oomd/dropin' + +[Unit] diff --git a/src/oomd/cfgen/test/cfgen_test_outputs/dev_T10/oomd2.json b/src/oomd/cfgen/test/cfgen_test_outputs/dev_T10/oomd2.json new file mode 100644 index 00000000..27585bf4 --- /dev/null +++ b/src/oomd/cfgen/test/cfgen_test_outputs/dev_T10/oomd2.json @@ -0,0 +1,176 @@ +@generated SignedSource<<144fbbb5092086132881c34359e24f88>> +@codegen-command arc cfgen update-outputs fb-oomd +{ + "rulesets": [ + { + "name": "system overview", + "silence-logs": "engine", + "detectors": [ + [ + "records system stats", + { + "name": "dump_cgroup_overview", + "args": { + "cgroup": "system.slice" + } + } + ] + ], + "actions": [ + { + "name": "continue", + "args": {} + } + ] + }, + { + "name": "user session protection", + "detectors": [ + [ + "user pressure above 60 for 300s", + { + "name": "pressure_above", + "args": { + "cgroup": "user.slice,workload.slice,www.slice", + "duration": "300", + "resource": "memory", + "threshold": "60" + } + }, + { + "name": "memory_reclaim", + "args": { + "cgroup": "user.slice,workload.slice,www.slice", + "duration": "30" + } + } + ], + [ + "system pressure above 80 for 300s", + { + "name": "pressure_above", + "args": { + "cgroup": "system.slice", + "duration": "300", + "resource": "memory", + "threshold": "80" + } + }, + { + "name": "memory_reclaim", + "args": { + "cgroup": "system.slice", + "duration": "30" + } + } + ] + ], + "actions": [ + { + "name": "kill_by_memory_size_or_growth", + "args": { + "cgroup": "user.slice/,system.slice/,workload.slice/,www.slice/", + "recursive": "true" + } + } + ] + }, + { + "name": "protection against low swap", + "detectors": [ + [ + "free swap goes below 5%", + { + "name": "swap_free", + "args": { + "threshold_pct": "5" + } + } + ] + ], + "actions": [ + { + "name": "kill_by_swap_usage", + "args": { + "cgroup": "user.slice/,system.slice/,workload.slice/,www.slice/", + "recursive": "true", + "threshold": "5" + } + } + ] + }, + { + "name": "senpai drop-in ruleset", + "silence-logs": "engine", + "drop-in": { + "disable-on-drop-in": true, + "actions": true + }, + "detectors": [ + [ + "continue detector group", + { + "name": "continue", + "args": {} + } + ] + ], + "actions": [ + { + "name": "continue", + "args": {} + } + ] + }, + { + "name": "restart smc_proxy.service on memory threshold", + "detectors": [ + [ + "memory usage above", + { + "name": "memory_above", + "args": { + "cgroup": "smc_proxy.service", + "duration": "10", + "threshold_anon": "15G" + } + } + ] + ], + "actions": [ + { + "name": "systemd_restart", + "args": { + "dry": "false", + "post_action_delay": "20", + "service": "smc_proxy.service" + } + } + ] + }, + { + "name": "tw_container drop-in ruleset", + "drop-in": { + "disable-on-drop-in": true, + "detectors": true, + "actions": true + }, + "detectors": [ + [ + "continue", + { + "name": "stop", + "args": {} + } + ] + ], + "actions": [ + { + "name": "continue", + "args": {} + } + ] + } + ], + "version": "1.0.0" +} \ No newline at end of file