[21.05] agent backport, part 3

nixos/platform/agent.nix

@@ -208,14 +208,17 @@ in
         {
           commands = [
             "${pkgs.fc.agent}/bin/fc-manage"
-            "${pkgs.fc.agent}/bin/fc-maintenance list"
-            "${pkgs.fc.agent}/bin/fc-maintenance show"
             "${pkgs.fc.agent}/bin/fc-maintenance delete"
-            "${pkgs.fc.agent}/bin/fc-maintenance metrics"
-            "${pkgs.fc.agent}/bin/fc-maintenance check"
+            "${pkgs.fc.agent}/bin/fc-maintenance -v delete"
           ];
           groups = [ "admins" "sudo-srv" "service" ];
         }
+        {
+          commands = [
+            "${pkgs.fc.agent}/bin/fc-maintenance request reboot"
+          ];
+          groups = [ "admins" ];
+        }
         {
           commands = [ "${pkgs.fc.agent}/bin/fc-manage check" ];
           groups = [ "sensuclient" ];
@@ -230,6 +233,10 @@ in
           commands = [
             "${pkgs.fc.agent}/bin/fc-maintenance run"
             "${pkgs.fc.agent}/bin/fc-maintenance run --run-all-now"
+            "${pkgs.fc.agent}/bin/fc-maintenance schedule"
+            "${pkgs.fc.agent}/bin/fc-maintenance -v run"
+            "${pkgs.fc.agent}/bin/fc-maintenance -v run --run-all-now"
+            "${pkgs.fc.agent}/bin/fc-maintenance -v schedule"
           ];
           groups = [ "admins" ];
         }
@@ -403,14 +410,14 @@ in
           };
           fc-maintenance = {
             notification = "fc-maintenance check failed.";
-            command = "sudo ${pkgs.fc.agent}/bin/fc-maintenance check";
+            command = "${pkgs.fc.agent}/bin/fc-maintenance check";
             interval = 180;
           };
         };
       };
       flyingcircus.services.telegraf.inputs = {
         exec = [{
-          commands = [ "/run/wrappers/bin/sudo ${pkgs.fc.agent}/bin/fc-maintenance metrics" ];
+          commands = [ "${pkgs.fc.agent}/bin/fc-maintenance metrics" ];
           timeout = "10s";
           data_format = "json";
           json_name_key = "name";

pkgs/fc/agent/default.nix

@@ -34,6 +34,20 @@ let
     buildInputs = [ pytest structlog ];
   };
 
+  stamina = py.buildPythonPackage rec {
+    pname = "stamina";
+    version = "23.1.0";
+    format = "pyproject";
+
+    src = fetchPypi {
+      inherit pname version;
+      hash = "sha256-sWzj1S1liqdduBP8amZht3Cr/qkV9yzaSOMl8qeFR4Y=";
+    };
+
+    nativeBuildInputs = with py; [ hatchling hatch-vcs hatch-fancy-pypi-readme ];
+    propagatedBuildInputs = with py; [ structlog tenacity typing-extensions ];
+  };
+
 in
 buildPythonPackage rec {
   name = "fc-agent-${version}";
@@ -67,6 +81,7 @@ buildPythonPackage rec {
     py.structlog
     py.typer
     py.pyyaml
+    stamina
     util-linux
   ] ++ lib.optionals stdenv.isLinux [
     dmidecode

pkgs/fc/agent/fc/conftest.py

@@ -34,7 +34,7 @@ def agent_maintenance_config(tmp_path):
 
 
 @fixture
-def reqmanager(tmp_path, agent_maintenance_config):
+def reqmanager(tmp_path, logger, agent_maintenance_config):
     spooldir = tmp_path / "maintenance"
     spooldir.mkdir()
     enc_path = tmp_path / "enc.json"
@@ -44,6 +44,7 @@ def reqmanager(tmp_path, agent_maintenance_config):
             spooldir=spooldir,
             enc_path=enc_path,
             config_file=agent_maintenance_config,
+            log=logger,
         ) as rm:
             yield rm
 
@@ -70,9 +71,12 @@ def _request_population(n):
 
 @fixture
 def logger():
-    _logger = structlog.get_logger()
-    _logger.trace = lambda *a, **k: None
-    return _logger
+    # pytest-structlog patches away structlog.config, but we can still use
+    # structlog._config.configure...
+    # We need to do that to support our custom `trace` logging method.
+    # It fails with BoundLoggingFilteringAtNotset which is the default wrapper.
+    structlog._config.configure(wrapper_class=structlog.BoundLogger)
+    return structlog.get_logger()
 
 
 @fixture

pkgs/fc/agent/fc/maintenance/activity/update.py

@@ -10,6 +10,7 @@
 from fc.maintenance import state
 from fc.maintenance.estimate import Estimate
 from fc.util import nixos
+from fc.util.logging import init_command_logging
 from fc.util.nixos import UnitChanges
 
 from ...util.channel import Channel
@@ -266,6 +267,8 @@ def run(self):
                 self.returncode = 0
                 return
 
+            init_command_logging(self.log)
+
             system_path = nixos.build_system(
                 self.next_channel_url, log=self.log
             )
@@ -290,6 +293,9 @@ def run(self):
             next_environment=self.next_environment,
         )
 
+        # No clean up of the command log file needed as we initialized
+        # logging only after checking that the activity changes the system.
+
         self.returncode = 0
 
     @property

pkgs/fc/agent/fc/maintenance/activity/vm_change.py

@@ -167,12 +167,11 @@ def _update_reboot_needed(self):
         else:
             self.reboot_needed = None
 
-    def load(self):
+    def run(self):
         self._update_reboot_needed()
-
-    # Running an VMChangeActivity is not needed, so no run method.
-    # The request manager handles the reboot required by this activity.
+        self.returncode = 0
 
     def resume(self):
-        # There's nothing to do so we can safely "retry" this activity.
+        # run() just checks if the reboot is needed at the moment so we can safely
+        # retry this activity.
         self.run()