From 26814c83ac9940a517b80edc6c22c620978e424a Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 7 Dec 2022 18:28:07 -0800 Subject: [PATCH] profile-gc: Make activeMeasurementGranularity configurable --- modules/profile-gc.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/profile-gc.nix b/modules/profile-gc.nix index 02b7238..ba2821a 100644 --- a/modules/profile-gc.nix +++ b/modules/profile-gc.nix @@ -49,16 +49,23 @@ in { awhile (so keepLatest won't protect them) generates a bunch of broken profiles (so keepLast won't protect them) while trying to get up to date. - This is approximate and has a useful granularity of an hour - (config.systemd.timers.profile-gc-log-active.timerConfig.OnUnitActiveSec). - Do not set less than this. + This threshold is approximate, see activeMeasurementGranularity. + Do not set less than activeMeasurementGranularity! ''; - # We admonish the user "Do not set less than this." and check it at runtime rather - # than verifying this with an assertion now because parsing these durations at - # configuration-time requires import-from-derivation, which we want to avoid. :( + # We admonish the user "Do not set less than activeMeasurementGranularity!" and check + # it at runtime rather than verifying this with an assertion at evaluation time because + # parsing these durations at evaluation-time requires import-from-derivation, which we + # want to avoid. :( type = lib.types.str; default = "5 days"; }; + activeMeasurementGranularity = lib.mkOption { + description = '' + How often to make a note of the currently-active profiles. This is the useful + granularity and minimum value of activeThreshold. + ''; + default = "1 hour"; + }; keepLatest = lib.mkOption { description = '' Keep all profiles younger than this duration (systemd.time format). @@ -190,7 +197,7 @@ in { ''; systemd.timers.profile-gc-log-active = { wantedBy = [ "timers.target" ]; - timerConfig.OnUnitActiveSec = "1 hour"; + timerConfig.OnUnitActiveSec = cfg.activeMeasurementGranularity; }; systemd.services.profile-gc-log-active = { description = -- 2.44.1