update ondemand oomd target

Summary: This was literaly updated in chef on Jun 3rd >_> Reviewed By: anps77 Differential Revision: D58289073 fbshipit-source-id: 5c2ac77fb8bebd204e1cb7221d4ab9120775d995
facebookincubator · Jun 7, 2024 · 3a7b8c0 · 3a7b8c0
1 parent b95708e
commit 3a7b8c0
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 67 deletions.
diff --git a/src/oomd/cfgen/src/cfgen.rs b/src/oomd/cfgen/src/cfgen.rs
@@ -848,9 +848,9 @@ fn senpai_limit_min_bytes(node: &Node) -> Option<String> {
 fn oomd2_oomd_target(node: &Node) -> String {
     match get_host_type(node) {
         HostType::DevServer => String::from("system.slice"),
-        HostType::OnDemand => {
-            String::from("system.slice,workload.slice/workload-tw.slice/quicksand*.service")
-        }
+        HostType::OnDemand => String::from(
+            "system.slice,system.slice/system-hgcache\\x2dupdater.slice/hgcache-updater*.service",
+        ),
         _ => String::from("workload.slice"),
     }
 }

diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/devvm.json b/src/oomd/cfgen/test/cfgen_test_inputs/devvm.json
@@ -1,4 +1,4 @@
-@generated SignedSource<<fc0baf1e6e709eabf64b1a0cb966db9e>>
+@generated SignedSource<<744c47fac51ed17121cb211ed2bbf42d>>
 @codegen-command arc cfgen update-inputs fb-oomd
 {
   "fqdn": "devvm3170.cln0.facebook.com",
@@ -77,7 +77,27 @@
       "ETH0",
       "ETH1",
       "SVC0"
-    ]
+    ],
+    "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/twshared_senpai_disabled.json b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled.json
@@ -1,4 +1,4 @@
-@generated SignedSource<<4e1840d2c3dc9925b88a8f546af46041>>
+@generated SignedSource<<5ad6adf39ebb79c51d54ce424e240bb0>>
 @codegen-command arc cfgen update-inputs fb-oomd
 {
   "fqdn": "twshared44829.07.ash9.facebook.com",
@@ -24,7 +24,7 @@
     "deviceType": "SERVER",
     "datacenter": "ash9",
     "cluster": "07",
-    "memTotal": 270023245824,
+    "memTotal": 270023241728,
     "osVersion": {
       "distribution_name": "CentOS Stream release",
       "version": 9,
@@ -91,7 +91,7 @@
     ]
   },
   "reservationConfig": {
-    "active_machine_materialization_id": "6321b66383934",
-    "current_reservation_host_profile_id": "COMMON:NO_CPU_CONTROLLER|KERNEL:kernel_5.12.0-0_fbk13_clang_7455_gb24de3bdb045_base.v8|STORAGE:XFS_FULL|RUNTIME:DATASTORES_GENERIC_SYSCTLS|KERNEL_ARGS:kargs_default.v2|KERNEL_POLICY:KERNEL_POLICY_DATABASES|BOOT_CONFIG:bootloader814_initrd230_swap16G_native_arch"
+    "active_machine_materialization_id": "6315e4a4e4c65",
+    "current_reservation_host_profile_id": "COMMON:NO_CPU_CONTROLLER|KERNEL:kernel_5.12.0-0_fbk13_clang_7455_gb24de3bdb045_base.v8|STORAGE:XFS_FULL|RUNTIME:DATASTORES_GENERIC_SYSCTLS|KERNEL_ARGS:kargs_default.v2|KERNEL_POLICY:KERNEL_POLICY_DATABASES|BOOT_CONFIG:bootloader814_initrd230_swap16G_native_arch|OS:CLASSIC"
   }
 }