cfgen: override for T10 dev hosts

Summary: title has it :) Reviewed By: anps77 Differential Revision: D58872884 fbshipit-source-id: 0d3cbaf7945cfeffcf479829467682fa6e0891a7
facebookincubator · Jun 21, 2024 · 485f17c · 485f17c
1 parent 61825d4
commit 485f17c
Show file tree

Hide file tree

Showing 22 changed files with 959 additions and 400 deletions.
diff --git 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
@@ -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
@@ -1,7 +1,7 @@
-@generated SignedSource<<c54e3fdf5805d4074185132a0ce23636>>
+@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
@@ -1,7 +1,7 @@
-@generated SignedSource<<e6cdcb8327d1e51500f7fc47e816cb6f>>
+@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": "",
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             return true;
         }
+        if node.hostname_prefix() == DEV && node.server_type() == FbServerType::TYPE_X_SEARCH {
+            return true;
+        }
         false
     }
@@ Expand Down @@