cfgen: implement dropin

Summary: title says it Reviewed By: anps77 Differential Revision: D57935308 fbshipit-source-id: bbf25ad8c4a552bc70d4a9c33849ff79c5abded3
facebookincubator · May 30, 2024 · b95708e · b95708e
1 parent 651bc3e
commit b95708e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/src/oomd/cfgen/src/cfgen.rs b/src/oomd/cfgen/src/cfgen.rs
@@ -19,11 +19,20 @@ fn oomd_json(node: &Node) -> Result<json::JsonValue, anyhow::Error> {
     }
 }
 
-fn oomd_dropin(node: &Node) -> Dropin {
-    // TODO(chengxiong): implement this
-    libcfgen::DropinBuilder::new()
-        .with_recommended_heap_profiling("fb-oomd")
-        .build(node)
+fn oomd_dropin(_node: &Node) -> Dropin {
+    let args = [
+        "--interval 1",
+        "--config /etc/oomd2.json",
+        "--drop-in-dir /run/oomd/dropin",
+    ];
+    let environment = convert_args!(btreemap!(
+        "OOMD_ARGS" => args.join(" "),
+    ));
+
+    Dropin {
+        environment,
+        ..Default::default()
+    }
 }
 
 // Rules generated from this function are based on the original

diff --git a/src/oomd/cfgen/test/cfgen_test_outputs/devvm/50-change-propagator.conf b/src/oomd/cfgen/test/cfgen_test_outputs/devvm/50-change-propagator.conf
@@ -1,4 +1,6 @@
-@generated SignedSource<<31b3f2f747768088bd5523d8e690bfac>>
+@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/ondemand/50-change-propagator.conf b/src/oomd/cfgen/test/cfgen_test_outputs/ondemand/50-change-propagator.conf
@@ -1,4 +1,6 @@
-@generated SignedSource<<31b3f2f747768088bd5523d8e690bfac>>
+@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/twshared_senpai_disabled/50-change-propagator.conf b/src/oomd/cfgen/test/cfgen_test_outputs/twshared_senpai_disabled/50-change-propagator.conf
@@ -1,4 +1,6 @@
-@generated SignedSource<<31b3f2f747768088bd5523d8e690bfac>>
+@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/twshared_t20_zionex/50-change-propagator.conf b/src/oomd/cfgen/test/cfgen_test_outputs/twshared_t20_zionex/50-change-propagator.conf
@@ -1,4 +1,6 @@
-@generated SignedSource<<31b3f2f747768088bd5523d8e690bfac>>
+@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/twshared_vll_shard00/50-change-propagator.conf b/src/oomd/cfgen/test/cfgen_test_outputs/twshared_vll_shard00/50-change-propagator.conf
@@ -1,4 +1,6 @@
-@generated SignedSource<<31b3f2f747768088bd5523d8e690bfac>>
+@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]