From f20f46e2d497814e5995e5a19cb0f2321ad1b404 Mon Sep 17 00:00:00 2001 From: Bin Tang Date: Fri, 2 Jun 2023 11:44:39 +0800 Subject: [PATCH] misc: add cgroup configuration for daemon Signed-off-by: Bin Tang --- config/config_test.go | 4 ++++ misc/snapshotter/config.toml | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/config/config_test.go b/config/config_test.go index 7941552c20..d0c8c90869 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -47,6 +47,10 @@ func TestLoadSnapshotterTOMLConfig(t *testing.T) { RecoverPolicy: "restart", NydusdConfigPath: "/etc/nydus/nydusd-config.fusedev.json", ThreadsNumber: 4, + CgroupConfig: CgroupConfig{ + MemoryLimit: "", + MemoryWatermarkScaleFactor: 1000, + }, }, SnapshotsConfig: SnapshotConfig{ EnableNydusOverlayFS: false, diff --git a/misc/snapshotter/config.toml b/misc/snapshotter/config.toml index ecc8ea6b42..d3bdfee701 100644 --- a/misc/snapshotter/config.toml +++ b/misc/snapshotter/config.toml @@ -33,6 +33,14 @@ recover_policy = "restart" # Setting to 0 will use the default configuration of nydusd. threads_number = 4 +[daemon.cgroup] +# The memory limit for nydusd.slice, which contains all nydusd processes. +# Percentage is supported as well, please ensure it is end with '%'. +memory_limit = "" +# The memory watermark scale factor for nydusd.slice. This entry is invalid +# when the per-memcg reclaim is not supported. +memory_watermark_scale_factor = 1000 + [log] # Print logs to stdout rather than logging files log_to_stdout = false